summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-02 13:03:05 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-02 13:03:05 +0300
commitee8191705826d978b7793497fdd307536c709bff (patch)
tree6cfbfc9d72bf636d2da373b4d023705207db4685
parentfb5d0e7762f692948dddebd3deb38a0bd20de5f2 (diff)
parent0c4ed5a9594b849b436fca13c6992dee923915ed (diff)
downloadplus-ee8191705826d978b7793497fdd307536c709bff.tar.gz
plus-ee8191705826d978b7793497fdd307536c709bff.tar.bz2
plus-ee8191705826d978b7793497fdd307536c709bff.tar.xz
plus-ee8191705826d978b7793497fdd307536c709bff.zip
Merge branch 'temp1' into stable
-rw-r--r--.gitignore4
-rw-r--r--ChangeLog10
-rw-r--r--README8
-rw-r--r--README.txt8
-rw-r--r--Xcode/ManaPlus.xcodeproj/project.pbxproj2380
-rw-r--r--Xcode/ManaPlus.xcodeproj/project.xcworkspace/xcshareddata/ManaPlus.xccheckout41
-rw-r--r--Xcode/Release/Release10.6.dmgCanvas/Disk Imagebin4722715 -> 0 bytes
-rw-r--r--Xcode/Release/Release10.6.dmgCanvas/QuickLook/Preview.jpgbin82595 -> 0 bytes
-rw-r--r--Xcode/Release/Release10.7+.dmgCanvas/Disk Imagebin4722715 -> 0 bytes
-rw-r--r--Xcode/Release/Release10.7+.dmgCanvas/QuickLook/Preview.jpgbin82415 -> 0 bytes
-rwxr-xr-xbuild/packevol2
-rwxr-xr-xbuild/packtmw2
-rwxr-xr-xbuild/packwin2
-rwxr-xr-xconfigure.ac4
-rw-r--r--po/ar.po604
-rw-r--r--po/bg.po604
-rw-r--r--po/ca.po606
-rw-r--r--po/cs.po431
-rw-r--r--po/da.po604
-rw-r--r--po/de.po434
-rw-r--r--po/el.po604
-rw-r--r--po/en_GB.po604
-rw-r--r--po/eo.po604
-rw-r--r--po/es.po436
-rw-r--r--po/et.po604
-rw-r--r--po/fa.po604
-rw-r--r--po/fi.po431
-rw-r--r--po/fr.po436
-rw-r--r--po/he.po604
-rw-r--r--po/hr.po604
-rw-r--r--po/hu.po604
-rw-r--r--po/id.po425
-rw-r--r--po/it.po430
-rw-r--r--po/ja.po434
-rw-r--r--po/ka.po604
-rw-r--r--po/manaplus.pot420
-rw-r--r--po/nb.po604
-rw-r--r--po/nl.po604
-rw-r--r--po/nl_BE.po430
-rw-r--r--po/pl.po434
-rw-r--r--po/pt.po434
-rw-r--r--po/pt_BR.po434
-rw-r--r--po/ru.po434
-rw-r--r--po/sk.po604
-rw-r--r--po/sq.po604
-rw-r--r--po/sv.po604
-rw-r--r--po/sv_SE.po604
-rw-r--r--po/te.po604
-rw-r--r--po/th.po604
-rw-r--r--po/tr.po430
-rw-r--r--po/vls.po604
-rw-r--r--po/zh_CN.po433
-rw-r--r--po/zh_HK.po604
-rw-r--r--po/zh_TW.po604
-rw-r--r--src/CMakeLists.txt3
-rw-r--r--src/Makefile.am1
-rw-r--r--src/actionmanager.cpp6
-rw-r--r--src/being/being.cpp45
-rw-r--r--src/being/being.h8
-rw-r--r--src/being/localplayer.h6
-rw-r--r--src/client.cpp54
-rw-r--r--src/client.h12
-rw-r--r--src/commands.cpp100
-rw-r--r--src/commands.h12
-rw-r--r--src/configuration.cpp2
-rw-r--r--src/configuration.h3
-rw-r--r--src/defaults.cpp5
-rw-r--r--src/eventsmanager.cpp2
-rw-r--r--src/game.cpp1
-rw-r--r--src/graphicsmanager.cpp5
-rw-r--r--src/gui/gui.cpp13
-rw-r--r--src/gui/gui.h2
-rw-r--r--src/gui/sdlinput.cpp72
-rw-r--r--src/gui/sdlinput.h25
-rw-r--r--src/gui/setupactiondata.h8
-rw-r--r--src/gui/viewport.cpp8
-rw-r--r--src/gui/widgets/characterdisplay.cpp5
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.cpp3
-rw-r--r--src/gui/widgets/setupitem.cpp24
-rw-r--r--src/gui/widgets/setupitem.h9
-rw-r--r--src/gui/widgets/tabbedarea.cpp10
-rw-r--r--src/gui/widgets/tabbedarea.h4
-rw-r--r--src/gui/widgets/tabs/setup_other.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_video.cpp36
-rw-r--r--src/gui/widgets/tabs/setup_visual.cpp20
-rw-r--r--src/gui/widgets/tabs/setup_visual.h1
-rw-r--r--src/gui/widgets/textfield.cpp11
-rw-r--r--src/gui/windows/chatwindow.cpp70
-rw-r--r--src/gui/windows/chatwindow.h2
-rw-r--r--src/gui/windows/equipmentwindow.cpp5
-rw-r--r--src/gui/windows/inventorywindow.cpp8
-rw-r--r--src/gui/windows/serverdialog.cpp3
-rw-r--r--src/gui/windows/updaterwindow.cpp4
-rw-r--r--src/guichan/actionevent.cpp25
-rw-r--r--src/guichan/basiccontainer.cpp25
-rw-r--r--src/guichan/cliprectangle.cpp25
-rw-r--r--src/guichan/color.cpp25
-rw-r--r--src/guichan/event.cpp25
-rw-r--r--src/guichan/exception.cpp25
-rw-r--r--src/guichan/focushandler.cpp25
-rw-r--r--src/guichan/font.cpp25
-rw-r--r--src/guichan/graphics.cpp25
-rw-r--r--src/guichan/gui.cpp25
-rw-r--r--src/guichan/image.cpp25
-rw-r--r--src/guichan/include/guichan/actionevent.hpp30
-rw-r--r--src/guichan/include/guichan/actionlistener.hpp30
-rw-r--r--src/guichan/include/guichan/basiccontainer.hpp30
-rw-r--r--src/guichan/include/guichan/cliprectangle.hpp28
-rw-r--r--src/guichan/include/guichan/color.hpp29
-rw-r--r--src/guichan/include/guichan/deathlistener.hpp30
-rw-r--r--src/guichan/include/guichan/event.hpp31
-rw-r--r--src/guichan/include/guichan/exception.hpp29
-rw-r--r--src/guichan/include/guichan/focushandler.hpp28
-rw-r--r--src/guichan/include/guichan/focuslistener.hpp30
-rw-r--r--src/guichan/include/guichan/font.hpp28
-rw-r--r--src/guichan/include/guichan/graphics.hpp28
-rw-r--r--src/guichan/include/guichan/gui.hpp28
-rw-r--r--src/guichan/include/guichan/image.hpp29
-rw-r--r--src/guichan/include/guichan/input.hpp29
-rw-r--r--src/guichan/include/guichan/inputevent.hpp30
-rw-r--r--src/guichan/include/guichan/key.hpp29
-rw-r--r--src/guichan/include/guichan/keyevent.hpp28
-rw-r--r--src/guichan/include/guichan/keyinput.hpp28
-rw-r--r--src/guichan/include/guichan/keylistener.hpp28
-rw-r--r--src/guichan/include/guichan/listmodel.hpp29
-rw-r--r--src/guichan/include/guichan/mouseevent.hpp30
-rw-r--r--src/guichan/include/guichan/mouseinput.hpp31
-rw-r--r--src/guichan/include/guichan/mouselistener.hpp28
-rw-r--r--src/guichan/include/guichan/platform.hpp76
-rw-r--r--src/guichan/include/guichan/rectangle.hpp29
-rw-r--r--src/guichan/include/guichan/sdl/sdlpixel.hpp25
-rw-r--r--src/guichan/include/guichan/selectionevent.hpp30
-rw-r--r--src/guichan/include/guichan/selectionlistener.hpp30
-rw-r--r--src/guichan/include/guichan/widget.hpp33
-rw-r--r--src/guichan/include/guichan/widgetlistener.hpp30
-rw-r--r--src/guichan/include/guichan/widgets/button.hpp34
-rw-r--r--src/guichan/include/guichan/widgets/checkbox.hpp28
-rw-r--r--src/guichan/include/guichan/widgets/container.hpp28
-rw-r--r--src/guichan/include/guichan/widgets/label.hpp28
-rw-r--r--src/guichan/include/guichan/widgets/listbox.hpp28
-rw-r--r--src/guichan/include/guichan/widgets/radiobutton.hpp28
-rw-r--r--src/guichan/include/guichan/widgets/scrollarea.hpp28
-rw-r--r--src/guichan/include/guichan/widgets/slider.hpp28
-rw-r--r--src/guichan/include/guichan/widgets/textbox.hpp28
-rw-r--r--src/guichan/include/guichan/widgets/textfield.hpp28
-rw-r--r--src/guichan/include/guichan/widgets/window.hpp30
-rw-r--r--src/guichan/inputevent.cpp25
-rw-r--r--src/guichan/key.cpp25
-rw-r--r--src/guichan/keyevent.cpp25
-rw-r--r--src/guichan/keyinput.cpp25
-rw-r--r--src/guichan/mouseevent.cpp25
-rw-r--r--src/guichan/mouseinput.cpp25
-rw-r--r--src/guichan/rectangle.cpp25
-rw-r--r--src/guichan/selectionevent.cpp25
-rw-r--r--src/guichan/widget.cpp25
-rw-r--r--src/guichan/widgets/button.cpp25
-rw-r--r--src/guichan/widgets/checkbox.cpp25
-rw-r--r--src/guichan/widgets/container.cpp25
-rw-r--r--src/guichan/widgets/label.cpp25
-rw-r--r--src/guichan/widgets/listbox.cpp25
-rw-r--r--src/guichan/widgets/radiobutton.cpp25
-rw-r--r--src/guichan/widgets/scrollarea.cpp25
-rw-r--r--src/guichan/widgets/slider.cpp25
-rw-r--r--src/guichan/widgets/textbox.cpp25
-rw-r--r--src/guichan/widgets/textfield.cpp25
-rw-r--r--src/guichan/widgets/window.cpp25
-rw-r--r--src/input/keyboarddata.h4
-rw-r--r--src/input/keydata.h2
-rw-r--r--src/localconsts.h7
-rw-r--r--src/main.h4
-rw-r--r--src/net/download.cpp258
-rw-r--r--src/net/download.h15
-rw-r--r--src/net/sdltcpnet.cpp4
-rw-r--r--src/render/graphics.cpp74
-rw-r--r--src/render/graphics.h31
-rw-r--r--src/render/mobileopenglgraphics.cpp28
-rw-r--r--src/render/normalopenglgraphics.cpp27
-rw-r--r--src/render/nullopenglgraphics.cpp9
-rw-r--r--src/render/openglgraphicsdef.hpp4
-rw-r--r--src/render/safeopenglgraphics.cpp28
-rw-r--r--src/render/sdl2graphics.cpp14
-rw-r--r--src/render/sdl2graphics.h1
-rw-r--r--src/render/sdl2softwaregraphics.cpp9
-rw-r--r--src/render/sdl2softwaregraphics.h1
-rw-r--r--src/render/sdlgraphics.cpp12
-rw-r--r--src/render/sdlgraphics.h1
-rw-r--r--src/render/surfacegraphics.h1
-rw-r--r--src/resources/beinginfo.cpp3
-rw-r--r--src/resources/beinginfo.h21
-rw-r--r--src/resources/db/emotedb.cpp3
-rw-r--r--src/resources/db/emotedb.h2
-rw-r--r--src/resources/db/petdb.cpp6
-rw-r--r--src/resources/resourcemanager.cpp2
-rw-r--r--src/utils/copynpaste.cpp11
-rw-r--r--src/utils/process.cpp6
195 files changed, 15030 insertions, 12075 deletions
diff --git a/.gitignore b/.gitignore
index d9156e4d5..3b37c3ec3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -149,4 +149,6 @@ Xcode/ManaPlus.xcodeproj/project.xcworkspace/xcuserdata
Xcode/Release/ManaPlus.dmg
Xcode/Release/*.dmg
Xcode/Release/Manaplus_ssh.txt
-
+Xcode/DerivedData/
+Xcode/Build/
+Xcode/Release/Release*
diff --git a/ChangeLog b/ChangeLog
index 88c01efb6..621846f01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2014-02-01 New release 1.4.2.1
+fix: pet talk in trade tab is disabled.
+fix: screenshot directory editing.
+fix: paths into tools in OpenBSD and FreeBSD.
+add: show emote id in emotes.
+add: attack action to pets.
+add: /dumpmods command.
+add: commands for upload config and log into pastebin.
+add: screen scale in OpenGL modes.
+
2014-01-18 New release 1.4.1.18
fix: npc font option.
fix: job bar showing in new installs.
diff --git a/README b/README
index 8e56c874e..38d863f3f 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.4.1.18 Date: 2014-01-18
+ Version: 1.4.2.1 Date: 2014-02-01
Development team:
- See AUTHORS file for a list
@@ -14,6 +14,10 @@ THE MANA PLUS CLIENT
- libcurl (HTTP downloads)
- zlib (Archives)
+ Additiona run time deps:
+ - xsel (for clipboard access, used only in SDL 1.2)
+ - xdg-open (from xdg-utils, for open url in browser)
+
0. Index
--------
@@ -131,5 +135,5 @@ If you're having issues with this client, feel free to report them to us.
You can report on forum http://forums.themanaworld.org/viewforum.php?f=12
or IRC on irc.freenode.net in the #manaplus channel.
-If you have feedback about a specific game that uses the Mana client, be sure
+If you have feedback about a specific game that uses the ManaPlus client, be sure
to contact the developers of the game instead.
diff --git a/README.txt b/README.txt
index 71105e910..f33a0ecaf 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.4.1.18 Date: 2014-01-18
+ Version: 1.4.2.1 Date: 2014-02-01
Development team:
- See AUTHORS file for a list
@@ -14,6 +14,10 @@ THE MANA PLUS CLIENT
- libcurl (HTTP downloads)
- zlib (Archives)
+ Additiona run time deps:
+ - xsel (for clipboard access, used only in SDL 1.2)
+ - xdg-open (from xdg-utils, for open url in browser)
+
0. Index
--------
@@ -131,5 +135,5 @@ If you're having issues with this client, feel free to report them to us.
You can report on forum http://forums.themanaworld.org/viewforum.php?f=12
or IRC on irc.freenode.net in the #manaplus channel.
-If you have feedback about a specific game that uses the Mana client, be sure
+If you have feedback about a specific game that uses the ManaPlus client, be sure
to contact the developers of the game instead.
diff --git a/Xcode/ManaPlus.xcodeproj/project.pbxproj b/Xcode/ManaPlus.xcodeproj/project.pbxproj
index e0435a8ca..b3ae3a845 100644
--- a/Xcode/ManaPlus.xcodeproj/project.pbxproj
+++ b/Xcode/ManaPlus.xcodeproj/project.pbxproj
@@ -7,21 +7,103 @@
objects = {
/* Begin PBXBuildFile section */
+ 2B12178B182711F8006F8EED /* mapheights.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B121789182711F8006F8EED /* mapheights.cpp */; };
+ 2B12178C182711F8006F8EED /* mapheights.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B121789182711F8006F8EED /* mapheights.cpp */; };
+ 2B1217D41827120D006F8EED /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B12178E1827120D006F8EED /* actor.cpp */; };
+ 2B1217D51827120D006F8EED /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B12178E1827120D006F8EED /* actor.cpp */; };
+ 2B1217D61827120D006F8EED /* actorsprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217901827120D006F8EED /* actorsprite.cpp */; };
+ 2B1217D71827120D006F8EED /* actorsprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217901827120D006F8EED /* actorsprite.cpp */; };
+ 2B1217D81827120D006F8EED /* being.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217931827120D006F8EED /* being.cpp */; };
+ 2B1217D91827120D006F8EED /* being.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217931827120D006F8EED /* being.cpp */; };
+ 2B1217DA1827120D006F8EED /* compoundsprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217961827120D006F8EED /* compoundsprite.cpp */; };
+ 2B1217DB1827120D006F8EED /* compoundsprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217961827120D006F8EED /* compoundsprite.cpp */; };
+ 2B1217DC1827120D006F8EED /* localplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217981827120D006F8EED /* localplayer.cpp */; };
+ 2B1217DD1827120D006F8EED /* localplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217981827120D006F8EED /* localplayer.cpp */; };
+ 2B1217DE1827120D006F8EED /* playerinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B12179A1827120D006F8EED /* playerinfo.cpp */; };
+ 2B1217DF1827120D006F8EED /* playerinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B12179A1827120D006F8EED /* playerinfo.cpp */; };
+ 2B1217E01827120D006F8EED /* playerrelations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B12179C1827120D006F8EED /* playerrelations.cpp */; };
+ 2B1217E11827120D006F8EED /* playerrelations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B12179C1827120D006F8EED /* playerrelations.cpp */; };
+ 2B1217E21827120D006F8EED /* inputevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B12179F1827120D006F8EED /* inputevent.cpp */; };
+ 2B1217E31827120D006F8EED /* inputevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B12179F1827120D006F8EED /* inputevent.cpp */; };
+ 2B1217E41827120D006F8EED /* inputmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217A11827120D006F8EED /* inputmanager.cpp */; };
+ 2B1217E51827120D006F8EED /* inputmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217A11827120D006F8EED /* inputmanager.cpp */; };
+ 2B1217E61827120D006F8EED /* joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217A31827120D006F8EED /* joystick.cpp */; };
+ 2B1217E71827120D006F8EED /* joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217A31827120D006F8EED /* joystick.cpp */; };
+ 2B1217E81827120D006F8EED /* keyboardconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217A51827120D006F8EED /* keyboardconfig.cpp */; };
+ 2B1217E91827120D006F8EED /* keyboardconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217A51827120D006F8EED /* keyboardconfig.cpp */; };
+ 2B1217EA1827120D006F8EED /* keyevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217A91827120D006F8EED /* keyevent.cpp */; };
+ 2B1217EB1827120D006F8EED /* keyevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217A91827120D006F8EED /* keyevent.cpp */; };
+ 2B1217EC1827120D006F8EED /* keyinput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217AB1827120D006F8EED /* keyinput.cpp */; };
+ 2B1217ED1827120D006F8EED /* keyinput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217AB1827120D006F8EED /* keyinput.cpp */; };
+ 2B1217EE1827120D006F8EED /* animationparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217AE1827120D006F8EED /* animationparticle.cpp */; };
+ 2B1217EF1827120D006F8EED /* animationparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217AE1827120D006F8EED /* animationparticle.cpp */; };
+ 2B1217F01827120D006F8EED /* imageparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217B01827120D006F8EED /* imageparticle.cpp */; };
+ 2B1217F11827120D006F8EED /* imageparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217B01827120D006F8EED /* imageparticle.cpp */; };
+ 2B1217F21827120D006F8EED /* particle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217B21827120D006F8EED /* particle.cpp */; };
+ 2B1217F31827120D006F8EED /* particle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217B21827120D006F8EED /* particle.cpp */; };
+ 2B1217F41827120D006F8EED /* particlecontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217B41827120D006F8EED /* particlecontainer.cpp */; };
+ 2B1217F51827120D006F8EED /* particlecontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217B41827120D006F8EED /* particlecontainer.cpp */; };
+ 2B1217F61827120D006F8EED /* particleemitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217B61827120D006F8EED /* particleemitter.cpp */; };
+ 2B1217F71827120D006F8EED /* particleemitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217B61827120D006F8EED /* particleemitter.cpp */; };
+ 2B1217F81827120D006F8EED /* rotationalparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217B91827120D006F8EED /* rotationalparticle.cpp */; };
+ 2B1217F91827120D006F8EED /* rotationalparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217B91827120D006F8EED /* rotationalparticle.cpp */; };
+ 2B1217FA1827120D006F8EED /* textparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217BB1827120D006F8EED /* textparticle.cpp */; };
+ 2B1217FB1827120D006F8EED /* textparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217BB1827120D006F8EED /* textparticle.cpp */; };
+ 2B1217FC1827120D006F8EED /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217BE1827120D006F8EED /* graphics.cpp */; };
+ 2B1217FD1827120D006F8EED /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217BE1827120D006F8EED /* graphics.cpp */; };
+ 2B1217FE1827120D006F8EED /* mobileopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217C01827120D006F8EED /* mobileopenglgraphics.cpp */; };
+ 2B1217FF1827120D006F8EED /* mobileopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217C01827120D006F8EED /* mobileopenglgraphics.cpp */; };
+ 2B1218001827120D006F8EED /* normalopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217C21827120D006F8EED /* normalopenglgraphics.cpp */; };
+ 2B1218011827120D006F8EED /* normalopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217C21827120D006F8EED /* normalopenglgraphics.cpp */; };
+ 2B1218021827120D006F8EED /* nullopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217C41827120D006F8EED /* nullopenglgraphics.cpp */; };
+ 2B1218031827120D006F8EED /* nullopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217C41827120D006F8EED /* nullopenglgraphics.cpp */; };
+ 2B1218041827120D006F8EED /* renderers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217C61827120D006F8EED /* renderers.cpp */; };
+ 2B1218051827120D006F8EED /* renderers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217C61827120D006F8EED /* renderers.cpp */; };
+ 2B1218061827120D006F8EED /* safeopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217CA1827120D006F8EED /* safeopenglgraphics.cpp */; };
+ 2B1218071827120D006F8EED /* safeopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217CA1827120D006F8EED /* safeopenglgraphics.cpp */; };
+ 2B1218081827120D006F8EED /* sdl2graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217CC1827120D006F8EED /* sdl2graphics.cpp */; };
+ 2B1218091827120D006F8EED /* sdl2graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217CC1827120D006F8EED /* sdl2graphics.cpp */; };
+ 2B12180A1827120D006F8EED /* sdl2softwaregraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217CE1827120D006F8EED /* sdl2softwaregraphics.cpp */; };
+ 2B12180B1827120D006F8EED /* sdl2softwaregraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217CE1827120D006F8EED /* sdl2softwaregraphics.cpp */; };
+ 2B12180C1827120D006F8EED /* sdlgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217D01827120D006F8EED /* sdlgraphics.cpp */; };
+ 2B12180D1827120D006F8EED /* sdlgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217D01827120D006F8EED /* sdlgraphics.cpp */; };
+ 2B12180E1827120D006F8EED /* surfacegraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217D21827120D006F8EED /* surfacegraphics.cpp */; };
+ 2B12180F1827120D006F8EED /* surfacegraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1217D21827120D006F8EED /* surfacegraphics.cpp */; };
+ 2B12181C182712A6006F8EED /* files.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B121810182712A6006F8EED /* files.cpp */; };
+ 2B12181D182712A6006F8EED /* files.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B121810182712A6006F8EED /* files.cpp */; };
+ 2B12181E182712A6006F8EED /* sdlcheckutils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B121812182712A6006F8EED /* sdlcheckutils.cpp */; };
+ 2B12181F182712A6006F8EED /* sdlcheckutils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B121812182712A6006F8EED /* sdlcheckutils.cpp */; };
+ 2B121820182712A6006F8EED /* sdlhelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B121814182712A6006F8EED /* sdlhelper.cpp */; };
+ 2B121821182712A6006F8EED /* sdlhelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B121814182712A6006F8EED /* sdlhelper.cpp */; };
+ 2B121822182712A6006F8EED /* physfscheckutils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B121815182712A6006F8EED /* physfscheckutils.cpp */; };
+ 2B121823182712A6006F8EED /* physfscheckutils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B121815182712A6006F8EED /* physfscheckutils.cpp */; };
+ 2B121824182712A6006F8EED /* sdl2helper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B121817182712A6006F8EED /* sdl2helper.cpp */; };
+ 2B121825182712A6006F8EED /* sdl2helper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B121817182712A6006F8EED /* sdl2helper.cpp */; };
+ 2B121826182712A6006F8EED /* fuzzer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B12181A182712A6006F8EED /* fuzzer.cpp */; };
+ 2B121827182712A6006F8EED /* fuzzer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B12181A182712A6006F8EED /* fuzzer.cpp */; };
+ 2B121835182712DC006F8EED /* beingcommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B12182D182712DC006F8EED /* beingcommon.cpp */; };
+ 2B121836182712DC006F8EED /* beingcommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B12182D182712DC006F8EED /* beingcommon.cpp */; };
+ 2B121837182712DC006F8EED /* sdl2imagehelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B12182F182712DC006F8EED /* sdl2imagehelper.cpp */; };
+ 2B121838182712DC006F8EED /* sdl2imagehelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B12182F182712DC006F8EED /* sdl2imagehelper.cpp */; };
+ 2B121839182712DC006F8EED /* sdl2softwareimagehelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B121830182712DC006F8EED /* sdl2softwareimagehelper.cpp */; };
+ 2B12183A182712DC006F8EED /* sdl2softwareimagehelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B121830182712DC006F8EED /* sdl2softwareimagehelper.cpp */; };
+ 2B12183B182712DC006F8EED /* surfaceimagehelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B121831182712DC006F8EED /* surfaceimagehelper.cpp */; };
+ 2B12183C182712DC006F8EED /* surfaceimagehelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B121831182712DC006F8EED /* surfaceimagehelper.cpp */; };
+ 2B1218471827137F006F8EED /* colorpage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1218421827137F006F8EED /* colorpage.cpp */; };
+ 2B1218481827137F006F8EED /* colorpage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1218421827137F006F8EED /* colorpage.cpp */; };
+ 2B1218491827137F006F8EED /* emotepage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1218441827137F006F8EED /* emotepage.cpp */; };
+ 2B12184A1827137F006F8EED /* emotepage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1218441827137F006F8EED /* emotepage.cpp */; };
+ 2B12184B1827137F006F8EED /* colormodel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1218461827137F006F8EED /* colormodel.cpp */; };
+ 2B12184C1827137F006F8EED /* colormodel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1218461827137F006F8EED /* colormodel.cpp */; };
2B1711951686A98C002E9493 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF45D6166D5AEC0054E77F /* AppDelegate.m */; };
2B1711961686A98C002E9493 /* actionmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4755166D5B680054E77F /* actionmanager.cpp */; };
- 2B1711971686A98C002E9493 /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4757166D5B680054E77F /* actor.cpp */; };
- 2B1711981686A98C002E9493 /* actorsprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4759166D5B680054E77F /* actorsprite.cpp */; };
- 2B1711991686A98C002E9493 /* actorspritemanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF475C166D5B680054E77F /* actorspritemanager.cpp */; };
2B17119A1686A98C002E9493 /* animatedsprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF475E166D5B680054E77F /* animatedsprite.cpp */; };
2B17119B1686A98C002E9493 /* animationdelayload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4760166D5B680054E77F /* animationdelayload.cpp */; };
- 2B17119C1686A98C002E9493 /* animationparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4762166D5B680054E77F /* animationparticle.cpp */; };
2B17119E1686A98C002E9493 /* avatar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4766166D5B680054E77F /* avatar.cpp */; };
- 2B17119F1686A98C002E9493 /* being.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4768166D5B680054E77F /* being.cpp */; };
2B1711A21686A98C002E9493 /* chatlogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF476E166D5B680054E77F /* chatlogger.cpp */; };
2B1711A31686A98C002E9493 /* client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4770166D5B680054E77F /* client.cpp */; };
2B1711A41686A98C002E9493 /* commandhandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4772166D5B680054E77F /* commandhandler.cpp */; };
2B1711A51686A98C002E9493 /* commands.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4774166D5B680054E77F /* commands.cpp */; };
- 2B1711A61686A98C002E9493 /* compoundsprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4776166D5B680054E77F /* compoundsprite.cpp */; };
2B1711A71686A98C002E9493 /* configuration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4779166D5B680054E77F /* configuration.cpp */; };
2B1711A81686A98C002E9493 /* debug_new.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF477C166D5B680054E77F /* debug_new.cpp */; };
2B1711A91686A98C002E9493 /* defaults.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4781166D5B680054E77F /* defaults.cpp */; };
@@ -31,84 +113,19 @@
2B1711AD1686A98C002E9493 /* emoteshortcut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4789166D5B680054E77F /* emoteshortcut.cpp */; };
2B1711AE1686A98C002E9493 /* flooritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF478E166D5B680054E77F /* flooritem.cpp */; };
2B1711AF1686A98C002E9493 /* game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4790166D5B680054E77F /* game.cpp */; };
- 2B1711B01686A98C002E9493 /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4792166D5B680054E77F /* graphics.cpp */; };
2B1711B11686A98C002E9493 /* graphicsmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4794166D5B680054E77F /* graphicsmanager.cpp */; };
2B1711B21686A98C002E9493 /* graphicsvertexes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4796166D5B680054E77F /* graphicsvertexes.cpp */; };
- 2B1711B31686A98C002E9493 /* beingpopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4799166D5B680054E77F /* beingpopup.cpp */; };
- 2B1711B41686A98C002E9493 /* botcheckerwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF479B166D5B680054E77F /* botcheckerwindow.cpp */; };
- 2B1711B51686A98C002E9493 /* buydialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF479D166D5B680054E77F /* buydialog.cpp */; };
- 2B1711B61686A98C002E9493 /* buyselldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF479F166D5B680054E77F /* buyselldialog.cpp */; };
- 2B1711B71686A98C002E9493 /* changeemaildialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47A1166D5B680054E77F /* changeemaildialog.cpp */; };
- 2B1711B81686A98C002E9493 /* changepassworddialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47A3166D5B680054E77F /* changepassworddialog.cpp */; };
- 2B1711B91686A98C002E9493 /* charcreatedialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47A5166D5B680054E77F /* charcreatedialog.cpp */; };
- 2B1711BA1686A98C002E9493 /* charselectdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47A7166D5B680054E77F /* charselectdialog.cpp */; };
- 2B1711BB1686A98C002E9493 /* chatwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47A9166D5B680054E77F /* chatwindow.cpp */; };
- 2B1711BC1686A98C002E9493 /* confirmdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47AB166D5B680054E77F /* confirmdialog.cpp */; };
- 2B1711BD1686A98C002E9493 /* connectiondialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47AD166D5B680054E77F /* connectiondialog.cpp */; };
- 2B1711BE1686A98C002E9493 /* debugwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47AF166D5B680054E77F /* debugwindow.cpp */; };
- 2B1711BF1686A98C002E9493 /* didyouknowwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47B1166D5B680054E77F /* didyouknowwindow.cpp */; };
- 2B1711C01686A98C002E9493 /* editdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47B3166D5B680054E77F /* editdialog.cpp */; };
- 2B1711C11686A98C002E9493 /* editserverdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47B5166D5B680054E77F /* editserverdialog.cpp */; };
- 2B1711C21686A98C002E9493 /* equipmentwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47B7166D5B680054E77F /* equipmentwindow.cpp */; };
2B1711C31686A98C002E9493 /* focushandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47B9166D5B680054E77F /* focushandler.cpp */; };
2B1711C41686A98C002E9493 /* gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47BB166D5B680054E77F /* gui.cpp */; };
- 2B1711C51686A98C002E9493 /* helpwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47BD166D5B680054E77F /* helpwindow.cpp */; };
- 2B1711C61686A98C002E9493 /* inventorywindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47BF166D5B680054E77F /* inventorywindow.cpp */; };
- 2B1711C71686A98C002E9493 /* itemamountwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47C1166D5B680054E77F /* itemamountwindow.cpp */; };
- 2B1711C81686A98C002E9493 /* itempopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47C3166D5B680054E77F /* itempopup.cpp */; };
- 2B1711C91686A98C002E9493 /* killstats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47C5166D5B680054E77F /* killstats.cpp */; };
- 2B1711CA1686A98C002E9493 /* logindialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47C7166D5B680054E77F /* logindialog.cpp */; };
- 2B1711CB1686A98C002E9493 /* minimap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47C9166D5B680054E77F /* minimap.cpp */; };
- 2B1711CC1686A98C002E9493 /* ministatuswindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47CB166D5B680054E77F /* ministatuswindow.cpp */; };
- 2B1711CD1686A98C002E9493 /* npcdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47CD166D5B680054E77F /* npcdialog.cpp */; };
- 2B1711CE1686A98C002E9493 /* npcpostdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47CF166D5B680054E77F /* npcpostdialog.cpp */; };
- 2B1711CF1686A98C002E9493 /* okdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47D1166D5B680054E77F /* okdialog.cpp */; };
- 2B1711D01686A98C002E9493 /* outfitwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47D3166D5B680054E77F /* outfitwindow.cpp */; };
2B1711D11686A98C002E9493 /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47D5166D5B680054E77F /* palette.cpp */; };
- 2B1711D21686A98C002E9493 /* popupmenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47D7166D5B680054E77F /* popupmenu.cpp */; };
- 2B1711D31686A98C002E9493 /* questswindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47D9166D5B680054E77F /* questswindow.cpp */; };
- 2B1711D41686A98C002E9493 /* quitdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47DB166D5B680054E77F /* quitdialog.cpp */; };
- 2B1711D51686A98C002E9493 /* registerdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47DD166D5B680054E77F /* registerdialog.cpp */; };
2B1711D61686A98C002E9493 /* sdlfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47DF166D5B680054E77F /* sdlfont.cpp */; };
2B1711D71686A98C002E9493 /* sdlinput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47E1166D5B680054E77F /* sdlinput.cpp */; };
- 2B1711D81686A98C002E9493 /* selldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47E3166D5B680054E77F /* selldialog.cpp */; };
- 2B1711D91686A98C002E9493 /* serverdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47E5166D5B680054E77F /* serverdialog.cpp */; };
- 2B1711DA1686A98C002E9493 /* setup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47E7166D5B680054E77F /* setup.cpp */; };
- 2B1711DB1686A98C002E9493 /* setup_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47E9166D5B680054E77F /* setup_audio.cpp */; };
- 2B1711DC1686A98C002E9493 /* setup_chat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47EB166D5B680054E77F /* setup_chat.cpp */; };
- 2B1711DD1686A98C002E9493 /* setup_colors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47ED166D5B680054E77F /* setup_colors.cpp */; };
- 2B1711DE1686A98C002E9493 /* setup_input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47EF166D5B680054E77F /* setup_input.cpp */; };
- 2B1711DF1686A98C002E9493 /* setup_joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47F1166D5B680054E77F /* setup_joystick.cpp */; };
- 2B1711E01686A98C002E9493 /* setup_other.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47F3166D5B680054E77F /* setup_other.cpp */; };
- 2B1711E11686A98C002E9493 /* setup_perfomance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47F5166D5B680054E77F /* setup_perfomance.cpp */; };
- 2B1711E21686A98C002E9493 /* setup_players.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47F7166D5B680054E77F /* setup_players.cpp */; };
- 2B1711E31686A98C002E9493 /* setup_relations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47F9166D5B680054E77F /* setup_relations.cpp */; };
- 2B1711E41686A98C002E9493 /* setup_theme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47FB166D5B680054E77F /* setup_theme.cpp */; };
- 2B1711E51686A98C002E9493 /* setup_video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47FD166D5B680054E77F /* setup_video.cpp */; };
- 2B1711E61686A98C002E9493 /* setup_visual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47FF166D5B680054E77F /* setup_visual.cpp */; };
- 2B1711E71686A98C002E9493 /* shopwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4802166D5B680054E77F /* shopwindow.cpp */; };
- 2B1711E81686A98C002E9493 /* shortcutwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4804166D5B680054E77F /* shortcutwindow.cpp */; };
- 2B1711E91686A98C002E9493 /* skilldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4806166D5B680054E77F /* skilldialog.cpp */; };
- 2B1711EA1686A98C002E9493 /* socialwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4808166D5B680054E77F /* socialwindow.cpp */; };
- 2B1711EB1686A98C002E9493 /* speechbubble.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF480C166D5B680054E77F /* speechbubble.cpp */; };
- 2B1711EC1686A98C002E9493 /* spellpopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF480E166D5B680054E77F /* spellpopup.cpp */; };
- 2B1711ED1686A98C002E9493 /* statuspopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4810166D5B680054E77F /* statuspopup.cpp */; };
- 2B1711EE1686A98C002E9493 /* statuswindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4812166D5B680054E77F /* statuswindow.cpp */; };
- 2B1711EF1686A98C002E9493 /* textcommandeditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4814166D5B680054E77F /* textcommandeditor.cpp */; };
- 2B1711F01686A98C002E9493 /* textdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4816166D5B680054E77F /* textdialog.cpp */; };
- 2B1711F11686A98C002E9493 /* textpopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4818166D5B680054E77F /* textpopup.cpp */; };
2B1711F21686A98C002E9493 /* theme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF481A166D5B680054E77F /* theme.cpp */; };
- 2B1711F31686A98C002E9493 /* tradewindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF481C166D5B680054E77F /* tradewindow.cpp */; };
- 2B1711F41686A98C002E9493 /* unregisterdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF481E166D5B680054E77F /* unregisterdialog.cpp */; };
- 2B1711F51686A98C002E9493 /* updaterwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4820166D5B680054E77F /* updaterwindow.cpp */; };
2B1711F61686A98C002E9493 /* userpalette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4822166D5B680054E77F /* userpalette.cpp */; };
2B1711F71686A98C002E9493 /* viewport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4824166D5B680054E77F /* viewport.cpp */; };
- 2B1711F81686A98C002E9493 /* whoisonline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4826166D5B680054E77F /* whoisonline.cpp */; };
2B1711F91686A98C002E9493 /* avatarlistbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4829166D5B680054E77F /* avatarlistbox.cpp */; };
- 2B1711FA1686A98C002E9493 /* battletab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF482B166D5B680054E77F /* battletab.cpp */; };
2B1711FB1686A98C002E9493 /* browserbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF482D166D5B680054E77F /* browserbox.cpp */; };
2B1711FC1686A98C002E9493 /* button.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4830166D5B680054E77F /* button.cpp */; };
- 2B1711FE1686A98C002E9493 /* chattab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4834166D5B680054E77F /* chattab.cpp */; };
2B1711FF1686A98C002E9493 /* checkbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4836166D5B680054E77F /* checkbox.cpp */; };
2B1712001686A98C002E9493 /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4838166D5B680054E77F /* container.cpp */; };
2B1712011686A98C002E9493 /* desktop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF483A166D5B680054E77F /* desktop.cpp */; };
@@ -118,7 +135,6 @@
2B1712051686A98C002E9493 /* extendedlistbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4842166D5B680054E77F /* extendedlistbox.cpp */; };
2B1712061686A98C002E9493 /* extendednamesmodel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4845166D5B680054E77F /* extendednamesmodel.cpp */; };
2B1712071686A98C002E9493 /* flowcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4847166D5B680054E77F /* flowcontainer.cpp */; };
- 2B1712081686A98C002E9493 /* guildchattab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4849166D5B680054E77F /* guildchattab.cpp */; };
2B1712091686A98C002E9493 /* guitable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF484B166D5B680054E77F /* guitable.cpp */; };
2B17120A1686A98C002E9493 /* horizontcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF484D166D5B680054E77F /* horizontcontainer.cpp */; };
2B17120B1686A98C002E9493 /* icon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF484F166D5B680054E77F /* icon.cpp */; };
@@ -140,29 +156,23 @@
2B17121B1686A98C002E9493 /* radiogroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4871166D5B680054E77F /* radiogroup.cpp */; };
2B17121C1686A98C002E9493 /* scrollarea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4873166D5B680054E77F /* scrollarea.cpp */; };
2B17121D1686A98C002E9493 /* setupitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4875166D5B680054E77F /* setupitem.cpp */; };
- 2B17121E1686A98C002E9493 /* setuptab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4877166D5B680054E77F /* setuptab.cpp */; };
- 2B17121F1686A98C002E9493 /* setuptabscroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4879166D5B680054E77F /* setuptabscroll.cpp */; };
2B1712201686A98C002E9493 /* shopitems.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF487B166D5B680054E77F /* shopitems.cpp */; };
2B1712211686A98C002E9493 /* shoplistbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF487D166D5B680054E77F /* shoplistbox.cpp */; };
2B1712221686A98C002E9493 /* shortcutcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF487F166D5B680054E77F /* shortcutcontainer.cpp */; };
2B1712231686A98C002E9493 /* slider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4881166D5B680054E77F /* slider.cpp */; };
2B1712241686A98C002E9493 /* sliderlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4883166D5B680054E77F /* sliderlist.cpp */; };
2B1712251686A98C002E9493 /* spellshortcutcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4885166D5B680054E77F /* spellshortcutcontainer.cpp */; };
- 2B1712261686A98C002E9493 /* tab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4887166D5B680054E77F /* tab.cpp */; };
2B1712271686A98C002E9493 /* tabbedarea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4889166D5B680054E77F /* tabbedarea.cpp */; };
2B1712281686A98C002E9493 /* tablemodel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF488B166D5B680054E77F /* tablemodel.cpp */; };
2B1712291686A98C002E9493 /* tabstrip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF488D166D5B680054E77F /* tabstrip.cpp */; };
2B17122A1686A98C002E9493 /* textbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF488F166D5B680054E77F /* textbox.cpp */; };
2B17122B1686A98C002E9493 /* textfield.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4891166D5B680054E77F /* textfield.cpp */; };
2B17122C1686A98C002E9493 /* textpreview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4893166D5B680054E77F /* textpreview.cpp */; };
- 2B17122D1686A98C002E9493 /* tradetab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4895166D5B680054E77F /* tradetab.cpp */; };
2B17122E1686A98C002E9493 /* vertcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4897166D5B680054E77F /* vertcontainer.cpp */; };
- 2B17122F1686A98C002E9493 /* whispertab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4899166D5B680054E77F /* whispertab.cpp */; };
2B1712301686A98C002E9493 /* widgetgroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF489C166D5B680054E77F /* widgetgroup.cpp */; };
2B1712311686A98C002E9493 /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF489E166D5B680054E77F /* window.cpp */; };
2B1712321686A98C002E9493 /* windowcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48A0166D5B680054E77F /* windowcontainer.cpp */; };
2B1712331686A98C002E9493 /* windowmenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48A2166D5B680054E77F /* windowmenu.cpp */; };
- 2B1712341686A98C002E9493 /* worldselectdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48A4166D5B680054E77F /* worldselectdialog.cpp */; };
2B1712351686A98C002E9493 /* actionevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48A7166D5B680054E77F /* actionevent.cpp */; };
2B1712361686A98C002E9493 /* basiccontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48A8166D5B680054E77F /* basiccontainer.cpp */; };
2B1712371686A98C002E9493 /* cliprectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48A9166D5B680054E77F /* cliprectangle.cpp */; };
@@ -181,7 +191,6 @@
2B1712441686A98C002E9493 /* mouseevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48E6166D5B680054E77F /* mouseevent.cpp */; };
2B1712451686A98C002E9493 /* mouseinput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48E7166D5B680054E77F /* mouseinput.cpp */; };
2B1712461686A98C002E9493 /* rectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48E8166D5B680054E77F /* rectangle.cpp */; };
- 2B1712471686A98C002E9493 /* sdlgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48EA166D5B680054E77F /* sdlgraphics.cpp */; };
2B1712481686A98C002E9493 /* selectionevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48EB166D5B680054E77F /* selectionevent.cpp */; };
2B1712491686A98C002E9493 /* widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48EC166D5B680054E77F /* widget.cpp */; };
2B17124A1686A98C002E9493 /* button.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48EE166D5B680054E77F /* button.cpp */; };
@@ -197,24 +206,14 @@
2B1712541686A98C002E9493 /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48F9166D5B680054E77F /* window.cpp */; };
2B1712551686A98C002E9493 /* guild.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48FA166D5B680054E77F /* guild.cpp */; };
2B1712561686A98C002E9493 /* guildmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48FC166D5B680054E77F /* guildmanager.cpp */; };
- 2B1712571686A98C002E9493 /* imageparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48FE166D5B680054E77F /* imageparticle.cpp */; };
2B1712581686A98C002E9493 /* imagesprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4900166D5B680054E77F /* imagesprite.cpp */; };
- 2B1712591686A98C002E9493 /* inputevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4902166D5B680054E77F /* inputevent.cpp */; };
- 2B17125A1686A98C002E9493 /* inputmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4904166D5B680054E77F /* inputmanager.cpp */; };
2B17125B1686A98C002E9493 /* inventory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4906166D5B680054E77F /* inventory.cpp */; };
2B17125C1686A98C002E9493 /* item.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4908166D5B680054E77F /* item.cpp */; };
2B17125D1686A98C002E9493 /* itemshortcut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF490A166D5B680054E77F /* itemshortcut.cpp */; };
- 2B17125E1686A98C002E9493 /* joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF490C166D5B680054E77F /* joystick.cpp */; };
- 2B17125F1686A98C002E9493 /* keyboardconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF490E166D5B680054E77F /* keyboardconfig.cpp */; };
- 2B1712601686A98C002E9493 /* keyevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4912166D5B680054E77F /* keyevent.cpp */; };
- 2B1712611686A98C002E9493 /* keyinput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4914166D5B680054E77F /* keyinput.cpp */; };
- 2B1712631686A98C002E9493 /* localplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4919166D5B680054E77F /* localplayer.cpp */; };
2B1712641686A98C002E9493 /* logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF491B166D5B680054E77F /* logger.cpp */; };
2B1712651686A98C002E9493 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF491D166D5B680054E77F /* main.cpp */; };
2B1712661686A98C002E9493 /* map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF491F166D5B680054E77F /* map.cpp */; };
2B1712671686A98C002E9493 /* maplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4921166D5B680054E77F /* maplayer.cpp */; };
- 2B1712681686A98C002E9493 /* mgl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4923166D5B680054E77F /* mgl.cpp */; };
- 2B1712691686A98C002E9493 /* mobileopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4925166D5B680054E77F /* mobileopenglgraphics.cpp */; };
2B17126A1686A98C002E9493 /* mouseinput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4927166D5B680054E77F /* mouseinput.cpp */; };
2B17126B1686A98C002E9493 /* mumblemanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4929166D5B680054E77F /* mumblemanager.cpp */; };
2B17126D1686A98C002E9493 /* download.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4932166D5B680054E77F /* download.cpp */; };
@@ -282,34 +281,21 @@
2B1712AD1686A98C002E9493 /* playerhandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49C7166D5B680054E77F /* playerhandler.cpp */; };
2B1712AE1686A98C002E9493 /* questhandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49CA166D5B680054E77F /* questhandler.cpp */; };
2B1712B01686A98C002E9493 /* tradehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49CE166D5B680054E77F /* tradehandler.cpp */; };
- 2B1712B11686A98C002E9493 /* normalopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49D2166D5B680054E77F /* normalopenglgraphics.cpp */; };
- 2B1712B21686A98C002E9493 /* particle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49D4166D5B680054E77F /* particle.cpp */; };
- 2B1712B31686A98C002E9493 /* particlecontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49D6166D5B680054E77F /* particlecontainer.cpp */; };
- 2B1712B41686A98C002E9493 /* particleemitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49D8166D5B680054E77F /* particleemitter.cpp */; };
2B1712B51686A98C002E9493 /* party.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49DB166D5B680054E77F /* party.cpp */; };
- 2B1712B61686A98C002E9493 /* playerinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49DD166D5B680054E77F /* playerinfo.cpp */; };
- 2B1712B71686A98C002E9493 /* playerrelations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49DF166D5B680054E77F /* playerrelations.cpp */; };
2B1712B81686A98C002E9493 /* position.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49E1166D5B680054E77F /* position.cpp */; };
2B1712B91686A98C002E9493 /* action.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49E5166D5B680054E77F /* action.cpp */; };
2B1712BA1686A98C002E9493 /* ambientlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49E7166D5B680054E77F /* ambientlayer.cpp */; };
2B1712BB1686A98C002E9493 /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49E9166D5B680054E77F /* animation.cpp */; };
2B1712BC1686A98C002E9493 /* atlasmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49EB166D5B680054E77F /* atlasmanager.cpp */; };
2B1712BD1686A98C002E9493 /* beinginfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49ED166D5B680054E77F /* beinginfo.cpp */; };
- 2B1712BE1686A98C002E9493 /* chardb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49EF166D5B680054E77F /* chardb.cpp */; };
- 2B1712BF1686A98C002E9493 /* colordb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49F1166D5B680054E77F /* colordb.cpp */; };
2B1712C01686A98C002E9493 /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49F3166D5B680054E77F /* cursor.cpp */; };
2B1712C11686A98C002E9493 /* dye.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49F5166D5B680054E77F /* dye.cpp */; };
- 2B1712C21686A98C002E9493 /* emotedb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49F7166D5B680054E77F /* emotedb.cpp */; };
2B1712C31686A98C002E9493 /* image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49FA166D5B680054E77F /* image.cpp */; };
2B1712C41686A98C002E9493 /* imagehelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49FC166D5B680054E77F /* imagehelper.cpp */; };
2B1712C51686A98C002E9493 /* imageset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49FE166D5B680054E77F /* imageset.cpp */; };
2B1712C61686A98C002E9493 /* imagewriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A00166D5B680054E77F /* imagewriter.cpp */; };
- 2B1712C71686A98C002E9493 /* itemdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A02166D5B680054E77F /* itemdb.cpp */; };
2B1712C81686A98C002E9493 /* iteminfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A04166D5B680054E77F /* iteminfo.cpp */; };
- 2B1712C91686A98C002E9493 /* mapdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A06166D5B680054E77F /* mapdb.cpp */; };
2B1712CA1686A98C002E9493 /* mapreader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A08166D5B680054E77F /* mapreader.cpp */; };
- 2B1712CB1686A98C002E9493 /* monsterdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A0A166D5B680054E77F /* monsterdb.cpp */; };
- 2B1712CC1686A98C002E9493 /* npcdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A0C166D5B680054E77F /* npcdb.cpp */; };
2B1712CD1686A98C002E9493 /* openglimagehelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A0E166D5B680054E77F /* openglimagehelper.cpp */; };
2B1712CE1686A98C002E9493 /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A10166D5B680054E77F /* resource.cpp */; };
2B1712CF1686A98C002E9493 /* resourcemanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A12166D5B680054E77F /* resourcemanager.cpp */; };
@@ -319,8 +305,6 @@
2B1712D41686A98C002E9493 /* spritedef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A1C166D5B680054E77F /* spritedef.cpp */; };
2B1712D51686A98C002E9493 /* subimage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A1E166D5B680054E77F /* subimage.cpp */; };
2B1712D61686A98C002E9493 /* wallpaper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A20166D5B680054E77F /* wallpaper.cpp */; };
- 2B1712D71686A98C002E9493 /* rotationalparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A22166D5B680054E77F /* rotationalparticle.cpp */; };
- 2B1712D81686A98C002E9493 /* safeopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A24166D5B680054E77F /* safeopenglgraphics.cpp */; };
2B1712D91686A98C002E9493 /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A27166D5B680054E77F /* SDLMain.m */; };
2B1712DA1686A98C002E9493 /* shopitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A28166D5B680054E77F /* shopitem.cpp */; };
2B1712DB1686A98C002E9493 /* simpleanimation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A2A166D5B680054E77F /* simpleanimation.cpp */; };
@@ -333,7 +317,6 @@
2B1712E21686A98C002E9493 /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A3A166D5B680054E77F /* text.cpp */; };
2B1712E31686A98C002E9493 /* textcommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A3C166D5B680054E77F /* textcommand.cpp */; };
2B1712E41686A98C002E9493 /* textmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A3E166D5B680054E77F /* textmanager.cpp */; };
- 2B1712E51686A98C002E9493 /* textparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A40166D5B680054E77F /* textparticle.cpp */; };
2B1712E61686A98C002E9493 /* touchactions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A44166D5B680054E77F /* touchactions.cpp */; };
2B1712E71686A98C002E9493 /* touchmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A46166D5B680054E77F /* touchmanager.cpp */; };
2B1712E81686A98C002E9493 /* units.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A48166D5B680054E77F /* units.cpp */; };
@@ -354,7 +337,6 @@
2B1712F71686A98C002E9493 /* xml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A70166D5B680054E77F /* xml.cpp */; };
2B1712F81686A98C002E9493 /* vector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A73166D5B680054E77F /* vector.cpp */; };
2B1712F91686A98C002E9493 /* popuplist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B8B70C9167EBCB3003A8440 /* popuplist.cpp */; };
- 2B1712FA1686A98C002E9493 /* setup_touch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B8B70CC167EBE3A003A8440 /* setup_touch.cpp */; };
2B1713031686A98C002E9493 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BDF4D54166D5DCD0054E77F /* OpenGL.framework */; };
2B1713041686A98C002E9493 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BDF45C3166D5AEC0054E77F /* Cocoa.framework */; };
2B1713051686A98C002E9493 /* SDL_image.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BDF4D4A166D5D9E0054E77F /* SDL_image.framework */; };
@@ -372,18 +354,12 @@
2B1713151686A98C002E9493 /* SDL_net.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D4C166D5D9E0054E77F /* SDL_net.framework */; };
2B1713161686A98C002E9493 /* SDL_ttf.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D4D166D5D9E0054E77F /* SDL_ttf.framework */; };
2B1713171686A98C002E9493 /* SDL.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 2BDF4D4E166D5D9E0054E77F /* SDL.framework */; };
- 2B1E2212172AF91A00B7230A /* sounddb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1E2210172AF91A00B7230A /* sounddb.cpp */; };
- 2B1E2213172AF91A00B7230A /* sounddb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1E2210172AF91A00B7230A /* sounddb.cpp */; };
2B1E2218172AF96000B7230A /* auctionmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1E2214172AF96000B7230A /* auctionmanager.cpp */; };
2B1E2219172AF96000B7230A /* auctionmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1E2214172AF96000B7230A /* auctionmanager.cpp */; };
2B1E221A172AF96000B7230A /* walklayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1E2216172AF96000B7230A /* walklayer.cpp */; };
2B1E221B172AF96000B7230A /* walklayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1E2216172AF96000B7230A /* walklayer.cpp */; };
- 2B1E221E172AF9E800B7230A /* langtab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1E221C172AF9E800B7230A /* langtab.cpp */; };
- 2B1E221F172AF9E800B7230A /* langtab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1E221C172AF9E800B7230A /* langtab.cpp */; };
2B1E2222172AFA2100B7230A /* navigationmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1E2220172AFA2100B7230A /* navigationmanager.cpp */; };
2B1E2223172AFA2100B7230A /* navigationmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1E2220172AFA2100B7230A /* navigationmanager.cpp */; };
- 2B1E2226172AFBB500B7230A /* petdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1E2224172AFBB500B7230A /* petdb.cpp */; };
- 2B1E2227172AFBB500B7230A /* petdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1E2224172AFBB500B7230A /* petdb.cpp */; };
2B1E222C172AFC4C00B7230A /* charserverhandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1E2228172AFC4C00B7230A /* charserverhandler.cpp */; };
2B1E222D172AFC4C00B7230A /* charserverhandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1E2228172AFC4C00B7230A /* charserverhandler.cpp */; };
2B1E222E172AFC4C00B7230A /* sdltcpnet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B1E222A172AFC4C00B7230A /* sdltcpnet.cpp */; };
@@ -395,8 +371,6 @@
2B65B45816EFC75D00AAD717 /* notifymanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B65B45516EFC75D00AAD717 /* notifymanager.cpp */; };
2B6B0E51176BDD3000930985 /* cpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B6B0E4F176BDD3000930985 /* cpu.cpp */; };
2B6B0E52176BDD3000930985 /* cpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B6B0E4F176BDD3000930985 /* cpu.cpp */; };
- 2B6B0E56176BDD7B00930985 /* avatardb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B6B0E54176BDD7B00930985 /* avatardb.cpp */; };
- 2B6B0E57176BDD7B00930985 /* avatardb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B6B0E54176BDD7B00930985 /* avatardb.cpp */; };
2B6B0E5E176BDDC100930985 /* skilldata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B6B0E58176BDDC100930985 /* skilldata.cpp */; };
2B6B0E5F176BDDC100930985 /* skilldata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B6B0E58176BDDC100930985 /* skilldata.cpp */; };
2B6B0E60176BDDC100930985 /* skillinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B6B0E5A176BDDC100930985 /* skillinfo.cpp */; };
@@ -413,17 +387,204 @@
2B6B0E77176BDE2A00930985 /* characterviewnormal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B6B0E70176BDE2A00930985 /* characterviewnormal.cpp */; };
2B6B0E78176BDE2A00930985 /* characterviewsmall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B6B0E72176BDE2A00930985 /* characterviewsmall.cpp */; };
2B6B0E79176BDE2A00930985 /* characterviewsmall.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B6B0E72176BDE2A00930985 /* characterviewsmall.cpp */; };
+ 2B72F26A18271656003A9FB7 /* beingpopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F20118271656003A9FB7 /* beingpopup.cpp */; };
+ 2B72F26B18271656003A9FB7 /* beingpopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F20118271656003A9FB7 /* beingpopup.cpp */; };
+ 2B72F26C18271656003A9FB7 /* itempopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F20318271656003A9FB7 /* itempopup.cpp */; };
+ 2B72F26D18271656003A9FB7 /* itempopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F20318271656003A9FB7 /* itempopup.cpp */; };
+ 2B72F26E18271656003A9FB7 /* popupmenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F20518271656003A9FB7 /* popupmenu.cpp */; };
+ 2B72F26F18271656003A9FB7 /* popupmenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F20518271656003A9FB7 /* popupmenu.cpp */; };
+ 2B72F27018271656003A9FB7 /* speechbubble.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F20718271656003A9FB7 /* speechbubble.cpp */; };
+ 2B72F27118271656003A9FB7 /* speechbubble.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F20718271656003A9FB7 /* speechbubble.cpp */; };
+ 2B72F27218271656003A9FB7 /* spellpopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F20918271656003A9FB7 /* spellpopup.cpp */; };
+ 2B72F27318271656003A9FB7 /* spellpopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F20918271656003A9FB7 /* spellpopup.cpp */; };
+ 2B72F27418271656003A9FB7 /* statuspopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F20B18271656003A9FB7 /* statuspopup.cpp */; };
+ 2B72F27518271656003A9FB7 /* statuspopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F20B18271656003A9FB7 /* statuspopup.cpp */; };
+ 2B72F27618271656003A9FB7 /* textpopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F20D18271656003A9FB7 /* textpopup.cpp */; };
+ 2B72F27718271656003A9FB7 /* textpopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F20D18271656003A9FB7 /* textpopup.cpp */; };
+ 2B72F27818271656003A9FB7 /* botcheckerwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F21018271656003A9FB7 /* botcheckerwindow.cpp */; };
+ 2B72F27918271656003A9FB7 /* botcheckerwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F21018271656003A9FB7 /* botcheckerwindow.cpp */; };
+ 2B72F27A18271656003A9FB7 /* buydialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F21218271656003A9FB7 /* buydialog.cpp */; };
+ 2B72F27B18271656003A9FB7 /* buydialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F21218271656003A9FB7 /* buydialog.cpp */; };
+ 2B72F27C18271656003A9FB7 /* buyselldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F21418271656003A9FB7 /* buyselldialog.cpp */; };
+ 2B72F27D18271656003A9FB7 /* buyselldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F21418271656003A9FB7 /* buyselldialog.cpp */; };
+ 2B72F27E18271656003A9FB7 /* changeemaildialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F21618271656003A9FB7 /* changeemaildialog.cpp */; };
+ 2B72F27F18271656003A9FB7 /* changeemaildialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F21618271656003A9FB7 /* changeemaildialog.cpp */; };
+ 2B72F28018271656003A9FB7 /* changepassworddialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F21818271656003A9FB7 /* changepassworddialog.cpp */; };
+ 2B72F28118271656003A9FB7 /* changepassworddialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F21818271656003A9FB7 /* changepassworddialog.cpp */; };
+ 2B72F28218271656003A9FB7 /* charcreatedialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F21A18271656003A9FB7 /* charcreatedialog.cpp */; };
+ 2B72F28318271656003A9FB7 /* charcreatedialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F21A18271656003A9FB7 /* charcreatedialog.cpp */; };
+ 2B72F28418271656003A9FB7 /* charselectdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F21C18271656003A9FB7 /* charselectdialog.cpp */; };
+ 2B72F28518271656003A9FB7 /* charselectdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F21C18271656003A9FB7 /* charselectdialog.cpp */; };
+ 2B72F28618271656003A9FB7 /* chatwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F21E18271656003A9FB7 /* chatwindow.cpp */; };
+ 2B72F28718271656003A9FB7 /* chatwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F21E18271656003A9FB7 /* chatwindow.cpp */; };
+ 2B72F28818271656003A9FB7 /* confirmdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F22018271656003A9FB7 /* confirmdialog.cpp */; };
+ 2B72F28918271656003A9FB7 /* confirmdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F22018271656003A9FB7 /* confirmdialog.cpp */; };
+ 2B72F28A18271656003A9FB7 /* connectiondialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F22218271656003A9FB7 /* connectiondialog.cpp */; };
+ 2B72F28B18271656003A9FB7 /* connectiondialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F22218271656003A9FB7 /* connectiondialog.cpp */; };
+ 2B72F28C18271656003A9FB7 /* debugwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F22418271656003A9FB7 /* debugwindow.cpp */; };
+ 2B72F28D18271656003A9FB7 /* debugwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F22418271656003A9FB7 /* debugwindow.cpp */; };
+ 2B72F28E18271656003A9FB7 /* didyouknowwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F22618271656003A9FB7 /* didyouknowwindow.cpp */; };
+ 2B72F28F18271656003A9FB7 /* didyouknowwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F22618271656003A9FB7 /* didyouknowwindow.cpp */; };
+ 2B72F29018271656003A9FB7 /* editdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F22818271656003A9FB7 /* editdialog.cpp */; };
+ 2B72F29118271656003A9FB7 /* editdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F22818271656003A9FB7 /* editdialog.cpp */; };
+ 2B72F29218271656003A9FB7 /* editserverdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F22A18271656003A9FB7 /* editserverdialog.cpp */; };
+ 2B72F29318271656003A9FB7 /* editserverdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F22A18271656003A9FB7 /* editserverdialog.cpp */; };
+ 2B72F29418271656003A9FB7 /* emotewindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F22C18271656003A9FB7 /* emotewindow.cpp */; };
+ 2B72F29518271656003A9FB7 /* emotewindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F22C18271656003A9FB7 /* emotewindow.cpp */; };
+ 2B72F29618271656003A9FB7 /* equipmentwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F22E18271656003A9FB7 /* equipmentwindow.cpp */; };
+ 2B72F29718271656003A9FB7 /* equipmentwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F22E18271656003A9FB7 /* equipmentwindow.cpp */; };
+ 2B72F29818271656003A9FB7 /* helpwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F23018271656003A9FB7 /* helpwindow.cpp */; };
+ 2B72F29918271656003A9FB7 /* helpwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F23018271656003A9FB7 /* helpwindow.cpp */; };
+ 2B72F29A18271656003A9FB7 /* inventorywindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F23218271656003A9FB7 /* inventorywindow.cpp */; };
+ 2B72F29B18271656003A9FB7 /* inventorywindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F23218271656003A9FB7 /* inventorywindow.cpp */; };
+ 2B72F29C18271656003A9FB7 /* itemamountwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F23418271656003A9FB7 /* itemamountwindow.cpp */; };
+ 2B72F29D18271656003A9FB7 /* itemamountwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F23418271656003A9FB7 /* itemamountwindow.cpp */; };
+ 2B72F29E18271656003A9FB7 /* killstats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F23618271656003A9FB7 /* killstats.cpp */; };
+ 2B72F29F18271656003A9FB7 /* killstats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F23618271656003A9FB7 /* killstats.cpp */; };
+ 2B72F2A018271656003A9FB7 /* logindialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F23818271656003A9FB7 /* logindialog.cpp */; };
+ 2B72F2A118271656003A9FB7 /* logindialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F23818271656003A9FB7 /* logindialog.cpp */; };
+ 2B72F2A218271656003A9FB7 /* minimap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F23A18271656003A9FB7 /* minimap.cpp */; };
+ 2B72F2A318271656003A9FB7 /* minimap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F23A18271656003A9FB7 /* minimap.cpp */; };
+ 2B72F2A418271656003A9FB7 /* ministatuswindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F23C18271656003A9FB7 /* ministatuswindow.cpp */; };
+ 2B72F2A518271656003A9FB7 /* ministatuswindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F23C18271656003A9FB7 /* ministatuswindow.cpp */; };
+ 2B72F2A618271656003A9FB7 /* npcdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F23E18271656003A9FB7 /* npcdialog.cpp */; };
+ 2B72F2A718271656003A9FB7 /* npcdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F23E18271656003A9FB7 /* npcdialog.cpp */; };
+ 2B72F2A818271656003A9FB7 /* npcpostdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F24018271656003A9FB7 /* npcpostdialog.cpp */; };
+ 2B72F2A918271656003A9FB7 /* npcpostdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F24018271656003A9FB7 /* npcpostdialog.cpp */; };
+ 2B72F2AA18271656003A9FB7 /* okdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F24218271656003A9FB7 /* okdialog.cpp */; };
+ 2B72F2AB18271656003A9FB7 /* okdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F24218271656003A9FB7 /* okdialog.cpp */; };
+ 2B72F2AC18271656003A9FB7 /* outfitwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F24418271656003A9FB7 /* outfitwindow.cpp */; };
+ 2B72F2AD18271656003A9FB7 /* outfitwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F24418271656003A9FB7 /* outfitwindow.cpp */; };
+ 2B72F2AE18271656003A9FB7 /* questswindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F24618271656003A9FB7 /* questswindow.cpp */; };
+ 2B72F2AF18271656003A9FB7 /* questswindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F24618271656003A9FB7 /* questswindow.cpp */; };
+ 2B72F2B018271656003A9FB7 /* quitdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F24818271656003A9FB7 /* quitdialog.cpp */; };
+ 2B72F2B118271656003A9FB7 /* quitdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F24818271656003A9FB7 /* quitdialog.cpp */; };
+ 2B72F2B218271656003A9FB7 /* registerdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F24A18271656003A9FB7 /* registerdialog.cpp */; };
+ 2B72F2B318271656003A9FB7 /* registerdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F24A18271656003A9FB7 /* registerdialog.cpp */; };
+ 2B72F2B418271656003A9FB7 /* selldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F24C18271656003A9FB7 /* selldialog.cpp */; };
+ 2B72F2B518271656003A9FB7 /* selldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F24C18271656003A9FB7 /* selldialog.cpp */; };
+ 2B72F2B618271656003A9FB7 /* serverdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F24E18271656003A9FB7 /* serverdialog.cpp */; };
+ 2B72F2B718271656003A9FB7 /* serverdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F24E18271656003A9FB7 /* serverdialog.cpp */; };
+ 2B72F2B818271656003A9FB7 /* setup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F25018271656003A9FB7 /* setup.cpp */; };
+ 2B72F2B918271656003A9FB7 /* setup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F25018271656003A9FB7 /* setup.cpp */; };
+ 2B72F2BA18271656003A9FB7 /* shopwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F25218271656003A9FB7 /* shopwindow.cpp */; };
+ 2B72F2BB18271656003A9FB7 /* shopwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F25218271656003A9FB7 /* shopwindow.cpp */; };
+ 2B72F2BC18271656003A9FB7 /* shortcutwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F25418271656003A9FB7 /* shortcutwindow.cpp */; };
+ 2B72F2BD18271656003A9FB7 /* shortcutwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F25418271656003A9FB7 /* shortcutwindow.cpp */; };
+ 2B72F2BE18271656003A9FB7 /* skilldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F25618271656003A9FB7 /* skilldialog.cpp */; };
+ 2B72F2BF18271656003A9FB7 /* skilldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F25618271656003A9FB7 /* skilldialog.cpp */; };
+ 2B72F2C018271656003A9FB7 /* socialwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F25818271656003A9FB7 /* socialwindow.cpp */; };
+ 2B72F2C118271656003A9FB7 /* socialwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F25818271656003A9FB7 /* socialwindow.cpp */; };
+ 2B72F2C218271656003A9FB7 /* statuswindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F25A18271656003A9FB7 /* statuswindow.cpp */; };
+ 2B72F2C318271656003A9FB7 /* statuswindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F25A18271656003A9FB7 /* statuswindow.cpp */; };
+ 2B72F2C418271656003A9FB7 /* textcommandeditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F25C18271656003A9FB7 /* textcommandeditor.cpp */; };
+ 2B72F2C518271656003A9FB7 /* textcommandeditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F25C18271656003A9FB7 /* textcommandeditor.cpp */; };
+ 2B72F2C618271656003A9FB7 /* textdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F25E18271656003A9FB7 /* textdialog.cpp */; };
+ 2B72F2C718271656003A9FB7 /* textdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F25E18271656003A9FB7 /* textdialog.cpp */; };
+ 2B72F2C818271656003A9FB7 /* tradewindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F26018271656003A9FB7 /* tradewindow.cpp */; };
+ 2B72F2C918271656003A9FB7 /* tradewindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F26018271656003A9FB7 /* tradewindow.cpp */; };
+ 2B72F2CA18271656003A9FB7 /* unregisterdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F26218271656003A9FB7 /* unregisterdialog.cpp */; };
+ 2B72F2CB18271656003A9FB7 /* unregisterdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F26218271656003A9FB7 /* unregisterdialog.cpp */; };
+ 2B72F2CC18271656003A9FB7 /* updaterwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F26418271656003A9FB7 /* updaterwindow.cpp */; };
+ 2B72F2CD18271656003A9FB7 /* updaterwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F26418271656003A9FB7 /* updaterwindow.cpp */; };
+ 2B72F2CE18271656003A9FB7 /* whoisonline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F26618271656003A9FB7 /* whoisonline.cpp */; };
+ 2B72F2CF18271656003A9FB7 /* whoisonline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F26618271656003A9FB7 /* whoisonline.cpp */; };
+ 2B72F2D018271656003A9FB7 /* worldselectdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F26818271656003A9FB7 /* worldselectdialog.cpp */; };
+ 2B72F2D118271656003A9FB7 /* worldselectdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F26818271656003A9FB7 /* worldselectdialog.cpp */; };
+ 2B72F2DA182716C1003A9FB7 /* actormanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2D2182716C1003A9FB7 /* actormanager.cpp */; };
+ 2B72F2DB182716C1003A9FB7 /* actormanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2D2182716C1003A9FB7 /* actormanager.cpp */; };
+ 2B72F2DC182716C1003A9FB7 /* eventsmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2D3182716C1003A9FB7 /* eventsmanager.cpp */; };
+ 2B72F2DD182716C1003A9FB7 /* eventsmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2D3182716C1003A9FB7 /* eventsmanager.cpp */; };
+ 2B72F2DE182716C1003A9FB7 /* itemsoundmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2D6182716C1003A9FB7 /* itemsoundmanager.cpp */; };
+ 2B72F2DF182716C1003A9FB7 /* itemsoundmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2D6182716C1003A9FB7 /* itemsoundmanager.cpp */; };
+ 2B72F2EB182716F1003A9FB7 /* multitouchmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2E9182716F1003A9FB7 /* multitouchmanager.cpp */; };
+ 2B72F2EC182716F1003A9FB7 /* multitouchmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2E9182716F1003A9FB7 /* multitouchmanager.cpp */; };
+ 2B72F30618271727003A9FB7 /* avatardb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2EE18271727003A9FB7 /* avatardb.cpp */; };
+ 2B72F30718271727003A9FB7 /* avatardb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2EE18271727003A9FB7 /* avatardb.cpp */; };
+ 2B72F30818271727003A9FB7 /* chardb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2F018271727003A9FB7 /* chardb.cpp */; };
+ 2B72F30918271727003A9FB7 /* chardb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2F018271727003A9FB7 /* chardb.cpp */; };
+ 2B72F30A18271727003A9FB7 /* colordb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2F218271727003A9FB7 /* colordb.cpp */; };
+ 2B72F30B18271727003A9FB7 /* colordb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2F218271727003A9FB7 /* colordb.cpp */; };
+ 2B72F30C18271727003A9FB7 /* deaddb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2F418271727003A9FB7 /* deaddb.cpp */; };
+ 2B72F30D18271727003A9FB7 /* deaddb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2F418271727003A9FB7 /* deaddb.cpp */; };
+ 2B72F30E18271727003A9FB7 /* emotedb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2F618271727003A9FB7 /* emotedb.cpp */; };
+ 2B72F30F18271727003A9FB7 /* emotedb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2F618271727003A9FB7 /* emotedb.cpp */; };
+ 2B72F31018271727003A9FB7 /* itemdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2F818271727003A9FB7 /* itemdb.cpp */; };
+ 2B72F31118271727003A9FB7 /* itemdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2F818271727003A9FB7 /* itemdb.cpp */; };
+ 2B72F31218271727003A9FB7 /* mapdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2FA18271727003A9FB7 /* mapdb.cpp */; };
+ 2B72F31318271727003A9FB7 /* mapdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2FA18271727003A9FB7 /* mapdb.cpp */; };
+ 2B72F31418271727003A9FB7 /* monsterdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2FC18271727003A9FB7 /* monsterdb.cpp */; };
+ 2B72F31518271727003A9FB7 /* monsterdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2FC18271727003A9FB7 /* monsterdb.cpp */; };
+ 2B72F31618271727003A9FB7 /* npcdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2FE18271727003A9FB7 /* npcdb.cpp */; };
+ 2B72F31718271727003A9FB7 /* npcdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F2FE18271727003A9FB7 /* npcdb.cpp */; };
+ 2B72F31818271727003A9FB7 /* palettedb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F30018271727003A9FB7 /* palettedb.cpp */; };
+ 2B72F31918271727003A9FB7 /* palettedb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F30018271727003A9FB7 /* palettedb.cpp */; };
+ 2B72F31A18271727003A9FB7 /* petdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F30218271727003A9FB7 /* petdb.cpp */; };
+ 2B72F31B18271727003A9FB7 /* petdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F30218271727003A9FB7 /* petdb.cpp */; };
+ 2B72F31C18271727003A9FB7 /* sounddb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F30418271727003A9FB7 /* sounddb.cpp */; };
+ 2B72F31D18271727003A9FB7 /* sounddb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F30418271727003A9FB7 /* sounddb.cpp */; };
+ 2B72F3201827173C003A9FB7 /* mgl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F31E1827173C003A9FB7 /* mgl.cpp */; };
+ 2B72F3211827173C003A9FB7 /* mgl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F31E1827173C003A9FB7 /* mgl.cpp */; };
+ 2B72F3511827175B003A9FB7 /* battletab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3231827175B003A9FB7 /* battletab.cpp */; };
+ 2B72F3521827175B003A9FB7 /* battletab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3231827175B003A9FB7 /* battletab.cpp */; };
+ 2B72F3531827175B003A9FB7 /* chattab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3251827175B003A9FB7 /* chattab.cpp */; };
+ 2B72F3541827175B003A9FB7 /* chattab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3251827175B003A9FB7 /* chattab.cpp */; };
+ 2B72F3551827175B003A9FB7 /* gmtab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3271827175B003A9FB7 /* gmtab.cpp */; };
+ 2B72F3561827175B003A9FB7 /* gmtab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3271827175B003A9FB7 /* gmtab.cpp */; };
+ 2B72F3571827175B003A9FB7 /* guildchattab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3291827175B003A9FB7 /* guildchattab.cpp */; };
+ 2B72F3581827175B003A9FB7 /* guildchattab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3291827175B003A9FB7 /* guildchattab.cpp */; };
+ 2B72F3591827175B003A9FB7 /* langtab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F32B1827175B003A9FB7 /* langtab.cpp */; };
+ 2B72F35A1827175B003A9FB7 /* langtab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F32B1827175B003A9FB7 /* langtab.cpp */; };
+ 2B72F35B1827175B003A9FB7 /* setup_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F32D1827175B003A9FB7 /* setup_audio.cpp */; };
+ 2B72F35C1827175B003A9FB7 /* setup_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F32D1827175B003A9FB7 /* setup_audio.cpp */; };
+ 2B72F35D1827175B003A9FB7 /* setup_chat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F32F1827175B003A9FB7 /* setup_chat.cpp */; };
+ 2B72F35E1827175B003A9FB7 /* setup_chat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F32F1827175B003A9FB7 /* setup_chat.cpp */; };
+ 2B72F35F1827175B003A9FB7 /* setup_colors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3311827175B003A9FB7 /* setup_colors.cpp */; };
+ 2B72F3601827175B003A9FB7 /* setup_colors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3311827175B003A9FB7 /* setup_colors.cpp */; };
+ 2B72F3611827175B003A9FB7 /* setup_input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3331827175B003A9FB7 /* setup_input.cpp */; };
+ 2B72F3621827175B003A9FB7 /* setup_input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3331827175B003A9FB7 /* setup_input.cpp */; };
+ 2B72F3631827175B003A9FB7 /* setup_joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3351827175B003A9FB7 /* setup_joystick.cpp */; };
+ 2B72F3641827175B003A9FB7 /* setup_joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3351827175B003A9FB7 /* setup_joystick.cpp */; };
+ 2B72F3651827175B003A9FB7 /* setup_other.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3371827175B003A9FB7 /* setup_other.cpp */; };
+ 2B72F3661827175B003A9FB7 /* setup_other.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3371827175B003A9FB7 /* setup_other.cpp */; };
+ 2B72F3671827175B003A9FB7 /* setup_perfomance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3391827175B003A9FB7 /* setup_perfomance.cpp */; };
+ 2B72F3681827175B003A9FB7 /* setup_perfomance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3391827175B003A9FB7 /* setup_perfomance.cpp */; };
+ 2B72F3691827175B003A9FB7 /* setup_players.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F33B1827175B003A9FB7 /* setup_players.cpp */; };
+ 2B72F36A1827175B003A9FB7 /* setup_players.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F33B1827175B003A9FB7 /* setup_players.cpp */; };
+ 2B72F36B1827175B003A9FB7 /* setup_relations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F33D1827175B003A9FB7 /* setup_relations.cpp */; };
+ 2B72F36C1827175B003A9FB7 /* setup_relations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F33D1827175B003A9FB7 /* setup_relations.cpp */; };
+ 2B72F36D1827175B003A9FB7 /* setup_theme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F33F1827175B003A9FB7 /* setup_theme.cpp */; };
+ 2B72F36E1827175B003A9FB7 /* setup_theme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F33F1827175B003A9FB7 /* setup_theme.cpp */; };
+ 2B72F36F1827175B003A9FB7 /* setup_touch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3411827175B003A9FB7 /* setup_touch.cpp */; };
+ 2B72F3701827175B003A9FB7 /* setup_touch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3411827175B003A9FB7 /* setup_touch.cpp */; };
+ 2B72F3711827175B003A9FB7 /* setup_video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3431827175B003A9FB7 /* setup_video.cpp */; };
+ 2B72F3721827175B003A9FB7 /* setup_video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3431827175B003A9FB7 /* setup_video.cpp */; };
+ 2B72F3731827175B003A9FB7 /* setup_visual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3451827175B003A9FB7 /* setup_visual.cpp */; };
+ 2B72F3741827175B003A9FB7 /* setup_visual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3451827175B003A9FB7 /* setup_visual.cpp */; };
+ 2B72F3751827175B003A9FB7 /* setuptab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3471827175B003A9FB7 /* setuptab.cpp */; };
+ 2B72F3761827175B003A9FB7 /* setuptab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3471827175B003A9FB7 /* setuptab.cpp */; };
+ 2B72F3771827175B003A9FB7 /* setuptabscroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3491827175B003A9FB7 /* setuptabscroll.cpp */; };
+ 2B72F3781827175B003A9FB7 /* setuptabscroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F3491827175B003A9FB7 /* setuptabscroll.cpp */; };
+ 2B72F3791827175B003A9FB7 /* tab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F34B1827175B003A9FB7 /* tab.cpp */; };
+ 2B72F37A1827175B003A9FB7 /* tab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F34B1827175B003A9FB7 /* tab.cpp */; };
+ 2B72F37B1827175B003A9FB7 /* tradetab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F34D1827175B003A9FB7 /* tradetab.cpp */; };
+ 2B72F37C1827175B003A9FB7 /* tradetab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F34D1827175B003A9FB7 /* tradetab.cpp */; };
+ 2B72F37D1827175B003A9FB7 /* whispertab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F34F1827175B003A9FB7 /* whispertab.cpp */; };
+ 2B72F37E1827175B003A9FB7 /* whispertab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B72F34F1827175B003A9FB7 /* whispertab.cpp */; };
2B7A5E5D16D82A3E0020A1C1 /* physfstools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B7A5E5B16D82A3E0020A1C1 /* physfstools.cpp */; };
2B7A5E5E16D82A3E0020A1C1 /* physfstools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B7A5E5B16D82A3E0020A1C1 /* physfstools.cpp */; };
- 2B7A5E6116D82C010020A1C1 /* gmtab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B7A5E5F16D82C010020A1C1 /* gmtab.cpp */; };
- 2B7A5E6216D82C010020A1C1 /* gmtab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B7A5E5F16D82C010020A1C1 /* gmtab.cpp */; };
2B8B70CB167EBCB3003A8440 /* popuplist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B8B70C9167EBCB3003A8440 /* popuplist.cpp */; };
- 2B8B70CE167EBE3A003A8440 /* setup_touch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B8B70CC167EBE3A003A8440 /* setup_touch.cpp */; };
+ 2B9A1A48188F3D40005F72F1 /* setup_mods.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B9A1A46188F3D40005F72F1 /* setup_mods.cpp */; };
+ 2B9A1A49188F3D40005F72F1 /* setup_mods.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B9A1A46188F3D40005F72F1 /* setup_mods.cpp */; };
+ 2B9A1A51188F3DAD005F72F1 /* pethandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B9A1A4F188F3DAD005F72F1 /* pethandler.cpp */; };
+ 2B9A1A52188F3DAD005F72F1 /* pethandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B9A1A4F188F3DAD005F72F1 /* pethandler.cpp */; };
+ 2B9A1A56188F3DE6005F72F1 /* timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B9A1A54188F3DE6005F72F1 /* timer.cpp */; };
+ 2B9A1A57188F3DE6005F72F1 /* timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B9A1A54188F3DE6005F72F1 /* timer.cpp */; };
+ 2B9A1A5A188F3EC6005F72F1 /* modinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B9A1A58188F3EC6005F72F1 /* modinfo.cpp */; };
+ 2B9A1A5B188F3EC6005F72F1 /* modinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B9A1A58188F3EC6005F72F1 /* modinfo.cpp */; };
+ 2B9A1A5E188F3EE4005F72F1 /* moddb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B9A1A5C188F3EE4005F72F1 /* moddb.cpp */; };
+ 2B9A1A5F188F3EE4005F72F1 /* moddb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2B9A1A5C188F3EE4005F72F1 /* moddb.cpp */; };
2BAC2B44166DB4B300874178 /* manaplus.icns in Resources */ = {isa = PBXBuildFile; fileRef = 2BAC2B43166DB4B300874178 /* manaplus.icns */; };
- 2BB28FB2172B43860046599B /* palettedb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BB28FB0172B43860046599B /* palettedb.cpp */; };
- 2BB28FB3172B43860046599B /* palettedb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BB28FB0172B43860046599B /* palettedb.cpp */; };
- 2BB28FB6172B4CEF0046599B /* nullopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BB28FB4172B4CEF0046599B /* nullopenglgraphics.cpp */; };
- 2BB28FB7172B4CEF0046599B /* nullopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BB28FB4172B4CEF0046599B /* nullopenglgraphics.cpp */; };
2BDF45C4166D5AEC0054E77F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2BDF45C3166D5AEC0054E77F /* Cocoa.framework */; };
2BDF45CE166D5AEC0054E77F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2BDF45CC166D5AEC0054E77F /* InfoPlist.strings */; };
2BDF45D4166D5AEC0054E77F /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2BDF45D2166D5AEC0054E77F /* Credits.rtf */; };
@@ -435,22 +596,12 @@
2BDF45EE166D5AEC0054E77F /* ManaPlusTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF45ED166D5AEC0054E77F /* ManaPlusTests.m */; };
2BDF4A76166D5B690054E77F /* actionmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4755166D5B680054E77F /* actionmanager.cpp */; };
2BDF4A77166D5B690054E77F /* actionmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4755166D5B680054E77F /* actionmanager.cpp */; };
- 2BDF4A78166D5B690054E77F /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4757166D5B680054E77F /* actor.cpp */; };
- 2BDF4A79166D5B690054E77F /* actor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4757166D5B680054E77F /* actor.cpp */; };
- 2BDF4A7A166D5B690054E77F /* actorsprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4759166D5B680054E77F /* actorsprite.cpp */; };
- 2BDF4A7B166D5B690054E77F /* actorsprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4759166D5B680054E77F /* actorsprite.cpp */; };
- 2BDF4A7C166D5B690054E77F /* actorspritemanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF475C166D5B680054E77F /* actorspritemanager.cpp */; };
- 2BDF4A7D166D5B690054E77F /* actorspritemanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF475C166D5B680054E77F /* actorspritemanager.cpp */; };
2BDF4A7E166D5B690054E77F /* animatedsprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF475E166D5B680054E77F /* animatedsprite.cpp */; };
2BDF4A7F166D5B690054E77F /* animatedsprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF475E166D5B680054E77F /* animatedsprite.cpp */; };
2BDF4A80166D5B690054E77F /* animationdelayload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4760166D5B680054E77F /* animationdelayload.cpp */; };
2BDF4A81166D5B690054E77F /* animationdelayload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4760166D5B680054E77F /* animationdelayload.cpp */; };
- 2BDF4A82166D5B690054E77F /* animationparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4762166D5B680054E77F /* animationparticle.cpp */; };
- 2BDF4A83166D5B690054E77F /* animationparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4762166D5B680054E77F /* animationparticle.cpp */; };
2BDF4A86166D5B690054E77F /* avatar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4766166D5B680054E77F /* avatar.cpp */; };
2BDF4A87166D5B690054E77F /* avatar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4766166D5B680054E77F /* avatar.cpp */; };
- 2BDF4A88166D5B690054E77F /* being.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4768166D5B680054E77F /* being.cpp */; };
- 2BDF4A89166D5B690054E77F /* being.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4768166D5B680054E77F /* being.cpp */; };
2BDF4A8E166D5B690054E77F /* chatlogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF476E166D5B680054E77F /* chatlogger.cpp */; };
2BDF4A8F166D5B690054E77F /* chatlogger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF476E166D5B680054E77F /* chatlogger.cpp */; };
2BDF4A90166D5B690054E77F /* client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4770166D5B680054E77F /* client.cpp */; };
@@ -459,8 +610,6 @@
2BDF4A93166D5B690054E77F /* commandhandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4772166D5B680054E77F /* commandhandler.cpp */; };
2BDF4A94166D5B690054E77F /* commands.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4774166D5B680054E77F /* commands.cpp */; };
2BDF4A95166D5B690054E77F /* commands.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4774166D5B680054E77F /* commands.cpp */; };
- 2BDF4A96166D5B690054E77F /* compoundsprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4776166D5B680054E77F /* compoundsprite.cpp */; };
- 2BDF4A97166D5B690054E77F /* compoundsprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4776166D5B680054E77F /* compoundsprite.cpp */; };
2BDF4A98166D5B690054E77F /* configuration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4779166D5B680054E77F /* configuration.cpp */; };
2BDF4A99166D5B690054E77F /* configuration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4779166D5B680054E77F /* configuration.cpp */; };
2BDF4A9A166D5B690054E77F /* debug_new.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF477C166D5B680054E77F /* debug_new.cpp */; };
@@ -479,162 +628,32 @@
2BDF4AAB166D5B690054E77F /* flooritem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF478E166D5B680054E77F /* flooritem.cpp */; };
2BDF4AAC166D5B690054E77F /* game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4790166D5B680054E77F /* game.cpp */; };
2BDF4AAD166D5B690054E77F /* game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4790166D5B680054E77F /* game.cpp */; };
- 2BDF4AAE166D5B690054E77F /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4792166D5B680054E77F /* graphics.cpp */; };
- 2BDF4AAF166D5B690054E77F /* graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4792166D5B680054E77F /* graphics.cpp */; };
2BDF4AB0166D5B690054E77F /* graphicsmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4794166D5B680054E77F /* graphicsmanager.cpp */; };
2BDF4AB1166D5B690054E77F /* graphicsmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4794166D5B680054E77F /* graphicsmanager.cpp */; };
2BDF4AB2166D5B690054E77F /* graphicsvertexes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4796166D5B680054E77F /* graphicsvertexes.cpp */; };
2BDF4AB3166D5B690054E77F /* graphicsvertexes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4796166D5B680054E77F /* graphicsvertexes.cpp */; };
- 2BDF4AB4166D5B690054E77F /* beingpopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4799166D5B680054E77F /* beingpopup.cpp */; };
- 2BDF4AB5166D5B690054E77F /* beingpopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4799166D5B680054E77F /* beingpopup.cpp */; };
- 2BDF4AB6166D5B690054E77F /* botcheckerwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF479B166D5B680054E77F /* botcheckerwindow.cpp */; };
- 2BDF4AB7166D5B690054E77F /* botcheckerwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF479B166D5B680054E77F /* botcheckerwindow.cpp */; };
- 2BDF4AB8166D5B690054E77F /* buydialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF479D166D5B680054E77F /* buydialog.cpp */; };
- 2BDF4AB9166D5B690054E77F /* buydialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF479D166D5B680054E77F /* buydialog.cpp */; };
- 2BDF4ABA166D5B690054E77F /* buyselldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF479F166D5B680054E77F /* buyselldialog.cpp */; };
- 2BDF4ABB166D5B690054E77F /* buyselldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF479F166D5B680054E77F /* buyselldialog.cpp */; };
- 2BDF4ABC166D5B690054E77F /* changeemaildialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47A1166D5B680054E77F /* changeemaildialog.cpp */; };
- 2BDF4ABD166D5B690054E77F /* changeemaildialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47A1166D5B680054E77F /* changeemaildialog.cpp */; };
- 2BDF4ABE166D5B690054E77F /* changepassworddialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47A3166D5B680054E77F /* changepassworddialog.cpp */; };
- 2BDF4ABF166D5B690054E77F /* changepassworddialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47A3166D5B680054E77F /* changepassworddialog.cpp */; };
- 2BDF4AC0166D5B690054E77F /* charcreatedialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47A5166D5B680054E77F /* charcreatedialog.cpp */; };
- 2BDF4AC1166D5B690054E77F /* charcreatedialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47A5166D5B680054E77F /* charcreatedialog.cpp */; };
- 2BDF4AC2166D5B690054E77F /* charselectdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47A7166D5B680054E77F /* charselectdialog.cpp */; };
- 2BDF4AC3166D5B690054E77F /* charselectdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47A7166D5B680054E77F /* charselectdialog.cpp */; };
- 2BDF4AC4166D5B690054E77F /* chatwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47A9166D5B680054E77F /* chatwindow.cpp */; };
- 2BDF4AC5166D5B690054E77F /* chatwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47A9166D5B680054E77F /* chatwindow.cpp */; };
- 2BDF4AC6166D5B690054E77F /* confirmdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47AB166D5B680054E77F /* confirmdialog.cpp */; };
- 2BDF4AC7166D5B690054E77F /* confirmdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47AB166D5B680054E77F /* confirmdialog.cpp */; };
- 2BDF4AC8166D5B690054E77F /* connectiondialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47AD166D5B680054E77F /* connectiondialog.cpp */; };
- 2BDF4AC9166D5B690054E77F /* connectiondialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47AD166D5B680054E77F /* connectiondialog.cpp */; };
- 2BDF4ACA166D5B690054E77F /* debugwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47AF166D5B680054E77F /* debugwindow.cpp */; };
- 2BDF4ACB166D5B690054E77F /* debugwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47AF166D5B680054E77F /* debugwindow.cpp */; };
- 2BDF4ACC166D5B690054E77F /* didyouknowwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47B1166D5B680054E77F /* didyouknowwindow.cpp */; };
- 2BDF4ACD166D5B690054E77F /* didyouknowwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47B1166D5B680054E77F /* didyouknowwindow.cpp */; };
- 2BDF4ACE166D5B690054E77F /* editdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47B3166D5B680054E77F /* editdialog.cpp */; };
- 2BDF4ACF166D5B690054E77F /* editdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47B3166D5B680054E77F /* editdialog.cpp */; };
- 2BDF4AD0166D5B690054E77F /* editserverdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47B5166D5B680054E77F /* editserverdialog.cpp */; };
- 2BDF4AD1166D5B690054E77F /* editserverdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47B5166D5B680054E77F /* editserverdialog.cpp */; };
- 2BDF4AD2166D5B690054E77F /* equipmentwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47B7166D5B680054E77F /* equipmentwindow.cpp */; };
- 2BDF4AD3166D5B690054E77F /* equipmentwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47B7166D5B680054E77F /* equipmentwindow.cpp */; };
2BDF4AD4166D5B690054E77F /* focushandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47B9166D5B680054E77F /* focushandler.cpp */; };
2BDF4AD5166D5B690054E77F /* focushandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47B9166D5B680054E77F /* focushandler.cpp */; };
2BDF4AD6166D5B690054E77F /* gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47BB166D5B680054E77F /* gui.cpp */; };
2BDF4AD7166D5B690054E77F /* gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47BB166D5B680054E77F /* gui.cpp */; };
- 2BDF4AD8166D5B690054E77F /* helpwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47BD166D5B680054E77F /* helpwindow.cpp */; };
- 2BDF4AD9166D5B690054E77F /* helpwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47BD166D5B680054E77F /* helpwindow.cpp */; };
- 2BDF4ADA166D5B690054E77F /* inventorywindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47BF166D5B680054E77F /* inventorywindow.cpp */; };
- 2BDF4ADB166D5B690054E77F /* inventorywindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47BF166D5B680054E77F /* inventorywindow.cpp */; };
- 2BDF4ADC166D5B690054E77F /* itemamountwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47C1166D5B680054E77F /* itemamountwindow.cpp */; };
- 2BDF4ADD166D5B690054E77F /* itemamountwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47C1166D5B680054E77F /* itemamountwindow.cpp */; };
- 2BDF4ADE166D5B690054E77F /* itempopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47C3166D5B680054E77F /* itempopup.cpp */; };
- 2BDF4ADF166D5B690054E77F /* itempopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47C3166D5B680054E77F /* itempopup.cpp */; };
- 2BDF4AE0166D5B690054E77F /* killstats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47C5166D5B680054E77F /* killstats.cpp */; };
- 2BDF4AE1166D5B690054E77F /* killstats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47C5166D5B680054E77F /* killstats.cpp */; };
- 2BDF4AE2166D5B690054E77F /* logindialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47C7166D5B680054E77F /* logindialog.cpp */; };
- 2BDF4AE3166D5B690054E77F /* logindialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47C7166D5B680054E77F /* logindialog.cpp */; };
- 2BDF4AE4166D5B690054E77F /* minimap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47C9166D5B680054E77F /* minimap.cpp */; };
- 2BDF4AE5166D5B690054E77F /* minimap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47C9166D5B680054E77F /* minimap.cpp */; };
- 2BDF4AE6166D5B690054E77F /* ministatuswindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47CB166D5B680054E77F /* ministatuswindow.cpp */; };
- 2BDF4AE7166D5B690054E77F /* ministatuswindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47CB166D5B680054E77F /* ministatuswindow.cpp */; };
- 2BDF4AE8166D5B690054E77F /* npcdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47CD166D5B680054E77F /* npcdialog.cpp */; };
- 2BDF4AE9166D5B690054E77F /* npcdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47CD166D5B680054E77F /* npcdialog.cpp */; };
- 2BDF4AEA166D5B690054E77F /* npcpostdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47CF166D5B680054E77F /* npcpostdialog.cpp */; };
- 2BDF4AEB166D5B690054E77F /* npcpostdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47CF166D5B680054E77F /* npcpostdialog.cpp */; };
- 2BDF4AEC166D5B690054E77F /* okdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47D1166D5B680054E77F /* okdialog.cpp */; };
- 2BDF4AED166D5B690054E77F /* okdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47D1166D5B680054E77F /* okdialog.cpp */; };
- 2BDF4AEE166D5B690054E77F /* outfitwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47D3166D5B680054E77F /* outfitwindow.cpp */; };
- 2BDF4AEF166D5B690054E77F /* outfitwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47D3166D5B680054E77F /* outfitwindow.cpp */; };
2BDF4AF0166D5B690054E77F /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47D5166D5B680054E77F /* palette.cpp */; };
2BDF4AF1166D5B690054E77F /* palette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47D5166D5B680054E77F /* palette.cpp */; };
- 2BDF4AF2166D5B690054E77F /* popupmenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47D7166D5B680054E77F /* popupmenu.cpp */; };
- 2BDF4AF3166D5B690054E77F /* popupmenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47D7166D5B680054E77F /* popupmenu.cpp */; };
- 2BDF4AF4166D5B690054E77F /* questswindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47D9166D5B680054E77F /* questswindow.cpp */; };
- 2BDF4AF5166D5B690054E77F /* questswindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47D9166D5B680054E77F /* questswindow.cpp */; };
- 2BDF4AF6166D5B690054E77F /* quitdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47DB166D5B680054E77F /* quitdialog.cpp */; };
- 2BDF4AF7166D5B690054E77F /* quitdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47DB166D5B680054E77F /* quitdialog.cpp */; };
- 2BDF4AF8166D5B690054E77F /* registerdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47DD166D5B680054E77F /* registerdialog.cpp */; };
- 2BDF4AF9166D5B690054E77F /* registerdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47DD166D5B680054E77F /* registerdialog.cpp */; };
2BDF4AFA166D5B690054E77F /* sdlfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47DF166D5B680054E77F /* sdlfont.cpp */; };
2BDF4AFB166D5B690054E77F /* sdlfont.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47DF166D5B680054E77F /* sdlfont.cpp */; };
2BDF4AFC166D5B690054E77F /* sdlinput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47E1166D5B680054E77F /* sdlinput.cpp */; };
2BDF4AFD166D5B690054E77F /* sdlinput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47E1166D5B680054E77F /* sdlinput.cpp */; };
- 2BDF4AFE166D5B690054E77F /* selldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47E3166D5B680054E77F /* selldialog.cpp */; };
- 2BDF4AFF166D5B690054E77F /* selldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47E3166D5B680054E77F /* selldialog.cpp */; };
- 2BDF4B00166D5B690054E77F /* serverdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47E5166D5B680054E77F /* serverdialog.cpp */; };
- 2BDF4B01166D5B690054E77F /* serverdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47E5166D5B680054E77F /* serverdialog.cpp */; };
- 2BDF4B02166D5B690054E77F /* setup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47E7166D5B680054E77F /* setup.cpp */; };
- 2BDF4B03166D5B690054E77F /* setup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47E7166D5B680054E77F /* setup.cpp */; };
- 2BDF4B04166D5B690054E77F /* setup_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47E9166D5B680054E77F /* setup_audio.cpp */; };
- 2BDF4B05166D5B690054E77F /* setup_audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47E9166D5B680054E77F /* setup_audio.cpp */; };
- 2BDF4B06166D5B690054E77F /* setup_chat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47EB166D5B680054E77F /* setup_chat.cpp */; };
- 2BDF4B07166D5B690054E77F /* setup_chat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47EB166D5B680054E77F /* setup_chat.cpp */; };
- 2BDF4B08166D5B690054E77F /* setup_colors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47ED166D5B680054E77F /* setup_colors.cpp */; };
- 2BDF4B09166D5B690054E77F /* setup_colors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47ED166D5B680054E77F /* setup_colors.cpp */; };
- 2BDF4B0A166D5B690054E77F /* setup_input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47EF166D5B680054E77F /* setup_input.cpp */; };
- 2BDF4B0B166D5B690054E77F /* setup_input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47EF166D5B680054E77F /* setup_input.cpp */; };
- 2BDF4B0C166D5B690054E77F /* setup_joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47F1166D5B680054E77F /* setup_joystick.cpp */; };
- 2BDF4B0D166D5B690054E77F /* setup_joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47F1166D5B680054E77F /* setup_joystick.cpp */; };
- 2BDF4B0E166D5B690054E77F /* setup_other.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47F3166D5B680054E77F /* setup_other.cpp */; };
- 2BDF4B0F166D5B690054E77F /* setup_other.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47F3166D5B680054E77F /* setup_other.cpp */; };
- 2BDF4B10166D5B690054E77F /* setup_perfomance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47F5166D5B680054E77F /* setup_perfomance.cpp */; };
- 2BDF4B11166D5B690054E77F /* setup_perfomance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47F5166D5B680054E77F /* setup_perfomance.cpp */; };
- 2BDF4B12166D5B690054E77F /* setup_players.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47F7166D5B680054E77F /* setup_players.cpp */; };
- 2BDF4B13166D5B690054E77F /* setup_players.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47F7166D5B680054E77F /* setup_players.cpp */; };
- 2BDF4B14166D5B690054E77F /* setup_relations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47F9166D5B680054E77F /* setup_relations.cpp */; };
- 2BDF4B15166D5B690054E77F /* setup_relations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47F9166D5B680054E77F /* setup_relations.cpp */; };
- 2BDF4B16166D5B690054E77F /* setup_theme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47FB166D5B680054E77F /* setup_theme.cpp */; };
- 2BDF4B17166D5B690054E77F /* setup_theme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47FB166D5B680054E77F /* setup_theme.cpp */; };
- 2BDF4B18166D5B690054E77F /* setup_video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47FD166D5B680054E77F /* setup_video.cpp */; };
- 2BDF4B19166D5B690054E77F /* setup_video.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47FD166D5B680054E77F /* setup_video.cpp */; };
- 2BDF4B1A166D5B690054E77F /* setup_visual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47FF166D5B680054E77F /* setup_visual.cpp */; };
- 2BDF4B1B166D5B690054E77F /* setup_visual.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF47FF166D5B680054E77F /* setup_visual.cpp */; };
- 2BDF4B1C166D5B690054E77F /* shopwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4802166D5B680054E77F /* shopwindow.cpp */; };
- 2BDF4B1D166D5B690054E77F /* shopwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4802166D5B680054E77F /* shopwindow.cpp */; };
- 2BDF4B1E166D5B690054E77F /* shortcutwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4804166D5B680054E77F /* shortcutwindow.cpp */; };
- 2BDF4B1F166D5B690054E77F /* shortcutwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4804166D5B680054E77F /* shortcutwindow.cpp */; };
- 2BDF4B20166D5B690054E77F /* skilldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4806166D5B680054E77F /* skilldialog.cpp */; };
- 2BDF4B21166D5B690054E77F /* skilldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4806166D5B680054E77F /* skilldialog.cpp */; };
- 2BDF4B22166D5B690054E77F /* socialwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4808166D5B680054E77F /* socialwindow.cpp */; };
- 2BDF4B23166D5B690054E77F /* socialwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4808166D5B680054E77F /* socialwindow.cpp */; };
- 2BDF4B26166D5B690054E77F /* speechbubble.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF480C166D5B680054E77F /* speechbubble.cpp */; };
- 2BDF4B27166D5B690054E77F /* speechbubble.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF480C166D5B680054E77F /* speechbubble.cpp */; };
- 2BDF4B28166D5B690054E77F /* spellpopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF480E166D5B680054E77F /* spellpopup.cpp */; };
- 2BDF4B29166D5B690054E77F /* spellpopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF480E166D5B680054E77F /* spellpopup.cpp */; };
- 2BDF4B2A166D5B690054E77F /* statuspopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4810166D5B680054E77F /* statuspopup.cpp */; };
- 2BDF4B2B166D5B690054E77F /* statuspopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4810166D5B680054E77F /* statuspopup.cpp */; };
- 2BDF4B2C166D5B690054E77F /* statuswindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4812166D5B680054E77F /* statuswindow.cpp */; };
- 2BDF4B2D166D5B690054E77F /* statuswindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4812166D5B680054E77F /* statuswindow.cpp */; };
- 2BDF4B2E166D5B690054E77F /* textcommandeditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4814166D5B680054E77F /* textcommandeditor.cpp */; };
- 2BDF4B2F166D5B690054E77F /* textcommandeditor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4814166D5B680054E77F /* textcommandeditor.cpp */; };
- 2BDF4B30166D5B690054E77F /* textdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4816166D5B680054E77F /* textdialog.cpp */; };
- 2BDF4B31166D5B690054E77F /* textdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4816166D5B680054E77F /* textdialog.cpp */; };
- 2BDF4B32166D5B690054E77F /* textpopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4818166D5B680054E77F /* textpopup.cpp */; };
- 2BDF4B33166D5B690054E77F /* textpopup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4818166D5B680054E77F /* textpopup.cpp */; };
2BDF4B34166D5B690054E77F /* theme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF481A166D5B680054E77F /* theme.cpp */; };
2BDF4B35166D5B690054E77F /* theme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF481A166D5B680054E77F /* theme.cpp */; };
- 2BDF4B36166D5B690054E77F /* tradewindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF481C166D5B680054E77F /* tradewindow.cpp */; };
- 2BDF4B37166D5B690054E77F /* tradewindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF481C166D5B680054E77F /* tradewindow.cpp */; };
- 2BDF4B38166D5B690054E77F /* unregisterdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF481E166D5B680054E77F /* unregisterdialog.cpp */; };
- 2BDF4B39166D5B690054E77F /* unregisterdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF481E166D5B680054E77F /* unregisterdialog.cpp */; };
- 2BDF4B3A166D5B690054E77F /* updaterwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4820166D5B680054E77F /* updaterwindow.cpp */; };
- 2BDF4B3B166D5B690054E77F /* updaterwindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4820166D5B680054E77F /* updaterwindow.cpp */; };
2BDF4B3C166D5B690054E77F /* userpalette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4822166D5B680054E77F /* userpalette.cpp */; };
2BDF4B3D166D5B690054E77F /* userpalette.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4822166D5B680054E77F /* userpalette.cpp */; };
2BDF4B3E166D5B690054E77F /* viewport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4824166D5B680054E77F /* viewport.cpp */; };
2BDF4B3F166D5B690054E77F /* viewport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4824166D5B680054E77F /* viewport.cpp */; };
- 2BDF4B40166D5B690054E77F /* whoisonline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4826166D5B680054E77F /* whoisonline.cpp */; };
- 2BDF4B41166D5B690054E77F /* whoisonline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4826166D5B680054E77F /* whoisonline.cpp */; };
2BDF4B42166D5B690054E77F /* avatarlistbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4829166D5B680054E77F /* avatarlistbox.cpp */; };
2BDF4B43166D5B690054E77F /* avatarlistbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4829166D5B680054E77F /* avatarlistbox.cpp */; };
- 2BDF4B44166D5B690054E77F /* battletab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF482B166D5B680054E77F /* battletab.cpp */; };
- 2BDF4B45166D5B690054E77F /* battletab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF482B166D5B680054E77F /* battletab.cpp */; };
2BDF4B46166D5B690054E77F /* browserbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF482D166D5B680054E77F /* browserbox.cpp */; };
2BDF4B47166D5B690054E77F /* browserbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF482D166D5B680054E77F /* browserbox.cpp */; };
2BDF4B4A166D5B690054E77F /* button.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4830166D5B680054E77F /* button.cpp */; };
2BDF4B4B166D5B690054E77F /* button.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4830166D5B680054E77F /* button.cpp */; };
- 2BDF4B4E166D5B690054E77F /* chattab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4834166D5B680054E77F /* chattab.cpp */; };
- 2BDF4B4F166D5B690054E77F /* chattab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4834166D5B680054E77F /* chattab.cpp */; };
2BDF4B50166D5B690054E77F /* checkbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4836166D5B680054E77F /* checkbox.cpp */; };
2BDF4B51166D5B690054E77F /* checkbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4836166D5B680054E77F /* checkbox.cpp */; };
2BDF4B52166D5B690054E77F /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4838166D5B680054E77F /* container.cpp */; };
@@ -653,8 +672,6 @@
2BDF4B5F166D5B690054E77F /* extendednamesmodel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4845166D5B680054E77F /* extendednamesmodel.cpp */; };
2BDF4B60166D5B690054E77F /* flowcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4847166D5B680054E77F /* flowcontainer.cpp */; };
2BDF4B61166D5B690054E77F /* flowcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4847166D5B680054E77F /* flowcontainer.cpp */; };
- 2BDF4B62166D5B690054E77F /* guildchattab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4849166D5B680054E77F /* guildchattab.cpp */; };
- 2BDF4B63166D5B690054E77F /* guildchattab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4849166D5B680054E77F /* guildchattab.cpp */; };
2BDF4B64166D5B690054E77F /* guitable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF484B166D5B680054E77F /* guitable.cpp */; };
2BDF4B65166D5B690054E77F /* guitable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF484B166D5B680054E77F /* guitable.cpp */; };
2BDF4B66166D5B690054E77F /* horizontcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF484D166D5B680054E77F /* horizontcontainer.cpp */; };
@@ -697,10 +714,6 @@
2BDF4B8B166D5B690054E77F /* scrollarea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4873166D5B680054E77F /* scrollarea.cpp */; };
2BDF4B8C166D5B690054E77F /* setupitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4875166D5B680054E77F /* setupitem.cpp */; };
2BDF4B8D166D5B690054E77F /* setupitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4875166D5B680054E77F /* setupitem.cpp */; };
- 2BDF4B8E166D5B690054E77F /* setuptab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4877166D5B680054E77F /* setuptab.cpp */; };
- 2BDF4B8F166D5B690054E77F /* setuptab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4877166D5B680054E77F /* setuptab.cpp */; };
- 2BDF4B90166D5B690054E77F /* setuptabscroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4879166D5B680054E77F /* setuptabscroll.cpp */; };
- 2BDF4B91166D5B690054E77F /* setuptabscroll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4879166D5B680054E77F /* setuptabscroll.cpp */; };
2BDF4B92166D5B690054E77F /* shopitems.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF487B166D5B680054E77F /* shopitems.cpp */; };
2BDF4B93166D5B690054E77F /* shopitems.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF487B166D5B680054E77F /* shopitems.cpp */; };
2BDF4B94166D5B690054E77F /* shoplistbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF487D166D5B680054E77F /* shoplistbox.cpp */; };
@@ -713,8 +726,6 @@
2BDF4B9B166D5B690054E77F /* sliderlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4883166D5B680054E77F /* sliderlist.cpp */; };
2BDF4B9C166D5B690054E77F /* spellshortcutcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4885166D5B680054E77F /* spellshortcutcontainer.cpp */; };
2BDF4B9D166D5B690054E77F /* spellshortcutcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4885166D5B680054E77F /* spellshortcutcontainer.cpp */; };
- 2BDF4B9E166D5B690054E77F /* tab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4887166D5B680054E77F /* tab.cpp */; };
- 2BDF4B9F166D5B690054E77F /* tab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4887166D5B680054E77F /* tab.cpp */; };
2BDF4BA0166D5B690054E77F /* tabbedarea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4889166D5B680054E77F /* tabbedarea.cpp */; };
2BDF4BA1166D5B690054E77F /* tabbedarea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4889166D5B680054E77F /* tabbedarea.cpp */; };
2BDF4BA2166D5B690054E77F /* tablemodel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF488B166D5B680054E77F /* tablemodel.cpp */; };
@@ -727,12 +738,8 @@
2BDF4BA9166D5B690054E77F /* textfield.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4891166D5B680054E77F /* textfield.cpp */; };
2BDF4BAA166D5B690054E77F /* textpreview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4893166D5B680054E77F /* textpreview.cpp */; };
2BDF4BAB166D5B690054E77F /* textpreview.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4893166D5B680054E77F /* textpreview.cpp */; };
- 2BDF4BAC166D5B690054E77F /* tradetab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4895166D5B680054E77F /* tradetab.cpp */; };
- 2BDF4BAD166D5B690054E77F /* tradetab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4895166D5B680054E77F /* tradetab.cpp */; };
2BDF4BAE166D5B690054E77F /* vertcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4897166D5B680054E77F /* vertcontainer.cpp */; };
2BDF4BAF166D5B690054E77F /* vertcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4897166D5B680054E77F /* vertcontainer.cpp */; };
- 2BDF4BB0166D5B690054E77F /* whispertab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4899166D5B680054E77F /* whispertab.cpp */; };
- 2BDF4BB1166D5B690054E77F /* whispertab.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4899166D5B680054E77F /* whispertab.cpp */; };
2BDF4BB2166D5B690054E77F /* widgetgroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF489C166D5B680054E77F /* widgetgroup.cpp */; };
2BDF4BB3166D5B690054E77F /* widgetgroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF489C166D5B680054E77F /* widgetgroup.cpp */; };
2BDF4BB4166D5B690054E77F /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF489E166D5B680054E77F /* window.cpp */; };
@@ -741,8 +748,6 @@
2BDF4BB7166D5B690054E77F /* windowcontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48A0166D5B680054E77F /* windowcontainer.cpp */; };
2BDF4BB8166D5B690054E77F /* windowmenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48A2166D5B680054E77F /* windowmenu.cpp */; };
2BDF4BB9166D5B690054E77F /* windowmenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48A2166D5B680054E77F /* windowmenu.cpp */; };
- 2BDF4BBA166D5B690054E77F /* worldselectdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48A4166D5B680054E77F /* worldselectdialog.cpp */; };
- 2BDF4BBB166D5B690054E77F /* worldselectdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48A4166D5B680054E77F /* worldselectdialog.cpp */; };
2BDF4BBC166D5B690054E77F /* actionevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48A7166D5B680054E77F /* actionevent.cpp */; };
2BDF4BBD166D5B690054E77F /* actionevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48A7166D5B680054E77F /* actionevent.cpp */; };
2BDF4BBE166D5B690054E77F /* basiccontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48A8166D5B680054E77F /* basiccontainer.cpp */; };
@@ -779,8 +784,6 @@
2BDF4BDD166D5B690054E77F /* mouseinput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48E7166D5B680054E77F /* mouseinput.cpp */; };
2BDF4BDE166D5B690054E77F /* rectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48E8166D5B680054E77F /* rectangle.cpp */; };
2BDF4BDF166D5B690054E77F /* rectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48E8166D5B680054E77F /* rectangle.cpp */; };
- 2BDF4BE0166D5B690054E77F /* sdlgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48EA166D5B680054E77F /* sdlgraphics.cpp */; };
- 2BDF4BE1166D5B690054E77F /* sdlgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48EA166D5B680054E77F /* sdlgraphics.cpp */; };
2BDF4BE2166D5B690054E77F /* selectionevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48EB166D5B680054E77F /* selectionevent.cpp */; };
2BDF4BE3166D5B690054E77F /* selectionevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48EB166D5B680054E77F /* selectionevent.cpp */; };
2BDF4BE4166D5B690054E77F /* widget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48EC166D5B680054E77F /* widget.cpp */; };
@@ -811,30 +814,14 @@
2BDF4BFF166D5B690054E77F /* guild.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48FA166D5B680054E77F /* guild.cpp */; };
2BDF4C00166D5B690054E77F /* guildmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48FC166D5B680054E77F /* guildmanager.cpp */; };
2BDF4C01166D5B690054E77F /* guildmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48FC166D5B680054E77F /* guildmanager.cpp */; };
- 2BDF4C02166D5B690054E77F /* imageparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48FE166D5B680054E77F /* imageparticle.cpp */; };
- 2BDF4C03166D5B690054E77F /* imageparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF48FE166D5B680054E77F /* imageparticle.cpp */; };
2BDF4C04166D5B690054E77F /* imagesprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4900166D5B680054E77F /* imagesprite.cpp */; };
2BDF4C05166D5B690054E77F /* imagesprite.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4900166D5B680054E77F /* imagesprite.cpp */; };
- 2BDF4C06166D5B690054E77F /* inputevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4902166D5B680054E77F /* inputevent.cpp */; };
- 2BDF4C07166D5B690054E77F /* inputevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4902166D5B680054E77F /* inputevent.cpp */; };
- 2BDF4C08166D5B690054E77F /* inputmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4904166D5B680054E77F /* inputmanager.cpp */; };
- 2BDF4C09166D5B690054E77F /* inputmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4904166D5B680054E77F /* inputmanager.cpp */; };
2BDF4C0A166D5B690054E77F /* inventory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4906166D5B680054E77F /* inventory.cpp */; };
2BDF4C0B166D5B690054E77F /* inventory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4906166D5B680054E77F /* inventory.cpp */; };
2BDF4C0C166D5B690054E77F /* item.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4908166D5B680054E77F /* item.cpp */; };
2BDF4C0D166D5B690054E77F /* item.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4908166D5B680054E77F /* item.cpp */; };
2BDF4C0E166D5B690054E77F /* itemshortcut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF490A166D5B680054E77F /* itemshortcut.cpp */; };
2BDF4C0F166D5B690054E77F /* itemshortcut.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF490A166D5B680054E77F /* itemshortcut.cpp */; };
- 2BDF4C10166D5B690054E77F /* joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF490C166D5B680054E77F /* joystick.cpp */; };
- 2BDF4C11166D5B690054E77F /* joystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF490C166D5B680054E77F /* joystick.cpp */; };
- 2BDF4C12166D5B690054E77F /* keyboardconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF490E166D5B680054E77F /* keyboardconfig.cpp */; };
- 2BDF4C13166D5B690054E77F /* keyboardconfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF490E166D5B680054E77F /* keyboardconfig.cpp */; };
- 2BDF4C14166D5B690054E77F /* keyevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4912166D5B680054E77F /* keyevent.cpp */; };
- 2BDF4C15166D5B690054E77F /* keyevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4912166D5B680054E77F /* keyevent.cpp */; };
- 2BDF4C16166D5B690054E77F /* keyinput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4914166D5B680054E77F /* keyinput.cpp */; };
- 2BDF4C17166D5B690054E77F /* keyinput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4914166D5B680054E77F /* keyinput.cpp */; };
- 2BDF4C1A166D5B690054E77F /* localplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4919166D5B680054E77F /* localplayer.cpp */; };
- 2BDF4C1B166D5B690054E77F /* localplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4919166D5B680054E77F /* localplayer.cpp */; };
2BDF4C1C166D5B690054E77F /* logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF491B166D5B680054E77F /* logger.cpp */; };
2BDF4C1D166D5B690054E77F /* logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF491B166D5B680054E77F /* logger.cpp */; };
2BDF4C1E166D5B690054E77F /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF491D166D5B680054E77F /* main.cpp */; };
@@ -843,10 +830,6 @@
2BDF4C21166D5B690054E77F /* map.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF491F166D5B680054E77F /* map.cpp */; };
2BDF4C22166D5B690054E77F /* maplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4921166D5B680054E77F /* maplayer.cpp */; };
2BDF4C23166D5B690054E77F /* maplayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4921166D5B680054E77F /* maplayer.cpp */; };
- 2BDF4C24166D5B690054E77F /* mgl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4923166D5B680054E77F /* mgl.cpp */; };
- 2BDF4C25166D5B690054E77F /* mgl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4923166D5B680054E77F /* mgl.cpp */; };
- 2BDF4C26166D5B690054E77F /* mobileopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4925166D5B680054E77F /* mobileopenglgraphics.cpp */; };
- 2BDF4C27166D5B690054E77F /* mobileopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4925166D5B680054E77F /* mobileopenglgraphics.cpp */; };
2BDF4C28166D5B690054E77F /* mouseinput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4927166D5B680054E77F /* mouseinput.cpp */; };
2BDF4C29166D5B690054E77F /* mouseinput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4927166D5B680054E77F /* mouseinput.cpp */; };
2BDF4C2A166D5B690054E77F /* mumblemanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4929166D5B680054E77F /* mumblemanager.cpp */; };
@@ -981,20 +964,8 @@
2BDF4CB1166D5B690054E77F /* questhandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49CA166D5B680054E77F /* questhandler.cpp */; };
2BDF4CB4166D5B690054E77F /* tradehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49CE166D5B680054E77F /* tradehandler.cpp */; };
2BDF4CB5166D5B690054E77F /* tradehandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49CE166D5B680054E77F /* tradehandler.cpp */; };
- 2BDF4CB6166D5B690054E77F /* normalopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49D2166D5B680054E77F /* normalopenglgraphics.cpp */; };
- 2BDF4CB7166D5B690054E77F /* normalopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49D2166D5B680054E77F /* normalopenglgraphics.cpp */; };
- 2BDF4CB8166D5B690054E77F /* particle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49D4166D5B680054E77F /* particle.cpp */; };
- 2BDF4CB9166D5B690054E77F /* particle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49D4166D5B680054E77F /* particle.cpp */; };
- 2BDF4CBA166D5B690054E77F /* particlecontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49D6166D5B680054E77F /* particlecontainer.cpp */; };
- 2BDF4CBB166D5B690054E77F /* particlecontainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49D6166D5B680054E77F /* particlecontainer.cpp */; };
- 2BDF4CBC166D5B690054E77F /* particleemitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49D8166D5B680054E77F /* particleemitter.cpp */; };
- 2BDF4CBD166D5B690054E77F /* particleemitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49D8166D5B680054E77F /* particleemitter.cpp */; };
2BDF4CBE166D5B690054E77F /* party.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49DB166D5B680054E77F /* party.cpp */; };
2BDF4CBF166D5B690054E77F /* party.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49DB166D5B680054E77F /* party.cpp */; };
- 2BDF4CC0166D5B690054E77F /* playerinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49DD166D5B680054E77F /* playerinfo.cpp */; };
- 2BDF4CC1166D5B690054E77F /* playerinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49DD166D5B680054E77F /* playerinfo.cpp */; };
- 2BDF4CC2166D5B690054E77F /* playerrelations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49DF166D5B680054E77F /* playerrelations.cpp */; };
- 2BDF4CC3166D5B690054E77F /* playerrelations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49DF166D5B680054E77F /* playerrelations.cpp */; };
2BDF4CC4166D5B690054E77F /* position.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49E1166D5B680054E77F /* position.cpp */; };
2BDF4CC5166D5B690054E77F /* position.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49E1166D5B680054E77F /* position.cpp */; };
2BDF4CC6166D5B690054E77F /* action.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49E5166D5B680054E77F /* action.cpp */; };
@@ -1007,16 +978,10 @@
2BDF4CCD166D5B690054E77F /* atlasmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49EB166D5B680054E77F /* atlasmanager.cpp */; };
2BDF4CCE166D5B690054E77F /* beinginfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49ED166D5B680054E77F /* beinginfo.cpp */; };
2BDF4CCF166D5B690054E77F /* beinginfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49ED166D5B680054E77F /* beinginfo.cpp */; };
- 2BDF4CD0166D5B690054E77F /* chardb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49EF166D5B680054E77F /* chardb.cpp */; };
- 2BDF4CD1166D5B690054E77F /* chardb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49EF166D5B680054E77F /* chardb.cpp */; };
- 2BDF4CD2166D5B690054E77F /* colordb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49F1166D5B680054E77F /* colordb.cpp */; };
- 2BDF4CD3166D5B690054E77F /* colordb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49F1166D5B680054E77F /* colordb.cpp */; };
2BDF4CD4166D5B690054E77F /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49F3166D5B680054E77F /* cursor.cpp */; };
2BDF4CD5166D5B690054E77F /* cursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49F3166D5B680054E77F /* cursor.cpp */; };
2BDF4CD6166D5B690054E77F /* dye.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49F5166D5B680054E77F /* dye.cpp */; };
2BDF4CD7166D5B690054E77F /* dye.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49F5166D5B680054E77F /* dye.cpp */; };
- 2BDF4CD8166D5B690054E77F /* emotedb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49F7166D5B680054E77F /* emotedb.cpp */; };
- 2BDF4CD9166D5B690054E77F /* emotedb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49F7166D5B680054E77F /* emotedb.cpp */; };
2BDF4CDA166D5B690054E77F /* image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49FA166D5B680054E77F /* image.cpp */; };
2BDF4CDB166D5B690054E77F /* image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49FA166D5B680054E77F /* image.cpp */; };
2BDF4CDC166D5B690054E77F /* imagehelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49FC166D5B680054E77F /* imagehelper.cpp */; };
@@ -1025,18 +990,10 @@
2BDF4CDF166D5B690054E77F /* imageset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF49FE166D5B680054E77F /* imageset.cpp */; };
2BDF4CE0166D5B690054E77F /* imagewriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A00166D5B680054E77F /* imagewriter.cpp */; };
2BDF4CE1166D5B690054E77F /* imagewriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A00166D5B680054E77F /* imagewriter.cpp */; };
- 2BDF4CE2166D5B690054E77F /* itemdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A02166D5B680054E77F /* itemdb.cpp */; };
- 2BDF4CE3166D5B690054E77F /* itemdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A02166D5B680054E77F /* itemdb.cpp */; };
2BDF4CE4166D5B690054E77F /* iteminfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A04166D5B680054E77F /* iteminfo.cpp */; };
2BDF4CE5166D5B690054E77F /* iteminfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A04166D5B680054E77F /* iteminfo.cpp */; };
- 2BDF4CE6166D5B690054E77F /* mapdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A06166D5B680054E77F /* mapdb.cpp */; };
- 2BDF4CE7166D5B690054E77F /* mapdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A06166D5B680054E77F /* mapdb.cpp */; };
2BDF4CE8166D5B690054E77F /* mapreader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A08166D5B680054E77F /* mapreader.cpp */; };
2BDF4CE9166D5B690054E77F /* mapreader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A08166D5B680054E77F /* mapreader.cpp */; };
- 2BDF4CEA166D5B690054E77F /* monsterdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A0A166D5B680054E77F /* monsterdb.cpp */; };
- 2BDF4CEB166D5B690054E77F /* monsterdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A0A166D5B680054E77F /* monsterdb.cpp */; };
- 2BDF4CEC166D5B690054E77F /* npcdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A0C166D5B680054E77F /* npcdb.cpp */; };
- 2BDF4CED166D5B690054E77F /* npcdb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A0C166D5B680054E77F /* npcdb.cpp */; };
2BDF4CEE166D5B690054E77F /* openglimagehelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A0E166D5B680054E77F /* openglimagehelper.cpp */; };
2BDF4CEF166D5B690054E77F /* openglimagehelper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A0E166D5B680054E77F /* openglimagehelper.cpp */; };
2BDF4CF0166D5B690054E77F /* resource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A10166D5B680054E77F /* resource.cpp */; };
@@ -1055,10 +1012,6 @@
2BDF4CFF166D5B690054E77F /* subimage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A1E166D5B680054E77F /* subimage.cpp */; };
2BDF4D00166D5B690054E77F /* wallpaper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A20166D5B680054E77F /* wallpaper.cpp */; };
2BDF4D01166D5B690054E77F /* wallpaper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A20166D5B680054E77F /* wallpaper.cpp */; };
- 2BDF4D02166D5B690054E77F /* rotationalparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A22166D5B680054E77F /* rotationalparticle.cpp */; };
- 2BDF4D03166D5B690054E77F /* rotationalparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A22166D5B680054E77F /* rotationalparticle.cpp */; };
- 2BDF4D04166D5B690054E77F /* safeopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A24166D5B680054E77F /* safeopenglgraphics.cpp */; };
- 2BDF4D05166D5B690054E77F /* safeopenglgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A24166D5B680054E77F /* safeopenglgraphics.cpp */; };
2BDF4D06166D5B690054E77F /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A27166D5B680054E77F /* SDLMain.m */; };
2BDF4D07166D5B690054E77F /* SDLMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A27166D5B680054E77F /* SDLMain.m */; };
2BDF4D08166D5B690054E77F /* shopitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A28166D5B680054E77F /* shopitem.cpp */; };
@@ -1083,8 +1036,6 @@
2BDF4D1B166D5B690054E77F /* textcommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A3C166D5B680054E77F /* textcommand.cpp */; };
2BDF4D1C166D5B690054E77F /* textmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A3E166D5B680054E77F /* textmanager.cpp */; };
2BDF4D1D166D5B690054E77F /* textmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A3E166D5B680054E77F /* textmanager.cpp */; };
- 2BDF4D1E166D5B690054E77F /* textparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A40166D5B680054E77F /* textparticle.cpp */; };
- 2BDF4D1F166D5B690054E77F /* textparticle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A40166D5B680054E77F /* textparticle.cpp */; };
2BDF4D20166D5B690054E77F /* touchactions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A44166D5B680054E77F /* touchactions.cpp */; };
2BDF4D21166D5B690054E77F /* touchactions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A44166D5B680054E77F /* touchactions.cpp */; };
2BDF4D22166D5B690054E77F /* touchmanager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BDF4A46166D5B680054E77F /* touchmanager.cpp */; };
@@ -1187,20 +1138,110 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
+ 2B121789182711F8006F8EED /* mapheights.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mapheights.cpp; path = ../../src/mapheights.cpp; sourceTree = "<group>"; };
+ 2B12178A182711F8006F8EED /* mapheights.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mapheights.h; path = ../../src/mapheights.h; sourceTree = "<group>"; };
+ 2B12178E1827120D006F8EED /* actor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = actor.cpp; sourceTree = "<group>"; };
+ 2B12178F1827120D006F8EED /* actor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = actor.h; sourceTree = "<group>"; };
+ 2B1217901827120D006F8EED /* actorsprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = actorsprite.cpp; sourceTree = "<group>"; };
+ 2B1217911827120D006F8EED /* actorsprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = actorsprite.h; sourceTree = "<group>"; };
+ 2B1217921827120D006F8EED /* actorspritelistener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = actorspritelistener.h; sourceTree = "<group>"; };
+ 2B1217931827120D006F8EED /* being.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = being.cpp; sourceTree = "<group>"; };
+ 2B1217941827120D006F8EED /* being.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = being.h; sourceTree = "<group>"; };
+ 2B1217951827120D006F8EED /* beingcacheentry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = beingcacheentry.h; sourceTree = "<group>"; };
+ 2B1217961827120D006F8EED /* compoundsprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = compoundsprite.cpp; sourceTree = "<group>"; };
+ 2B1217971827120D006F8EED /* compoundsprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = compoundsprite.h; sourceTree = "<group>"; };
+ 2B1217981827120D006F8EED /* localplayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = localplayer.cpp; sourceTree = "<group>"; };
+ 2B1217991827120D006F8EED /* localplayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = localplayer.h; sourceTree = "<group>"; };
+ 2B12179A1827120D006F8EED /* playerinfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = playerinfo.cpp; sourceTree = "<group>"; };
+ 2B12179B1827120D006F8EED /* playerinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = playerinfo.h; sourceTree = "<group>"; };
+ 2B12179C1827120D006F8EED /* playerrelations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = playerrelations.cpp; sourceTree = "<group>"; };
+ 2B12179D1827120D006F8EED /* playerrelations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = playerrelations.h; sourceTree = "<group>"; };
+ 2B12179F1827120D006F8EED /* inputevent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inputevent.cpp; sourceTree = "<group>"; };
+ 2B1217A01827120D006F8EED /* inputevent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inputevent.h; sourceTree = "<group>"; };
+ 2B1217A11827120D006F8EED /* inputmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inputmanager.cpp; sourceTree = "<group>"; };
+ 2B1217A21827120D006F8EED /* inputmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inputmanager.h; sourceTree = "<group>"; };
+ 2B1217A31827120D006F8EED /* joystick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = joystick.cpp; sourceTree = "<group>"; };
+ 2B1217A41827120D006F8EED /* joystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = joystick.h; sourceTree = "<group>"; };
+ 2B1217A51827120D006F8EED /* keyboardconfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = keyboardconfig.cpp; sourceTree = "<group>"; };
+ 2B1217A61827120D006F8EED /* keyboardconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keyboardconfig.h; sourceTree = "<group>"; };
+ 2B1217A71827120D006F8EED /* keyboarddata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keyboarddata.h; sourceTree = "<group>"; };
+ 2B1217A81827120D006F8EED /* keydata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keydata.h; sourceTree = "<group>"; };
+ 2B1217A91827120D006F8EED /* keyevent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = keyevent.cpp; sourceTree = "<group>"; };
+ 2B1217AA1827120D006F8EED /* keyevent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keyevent.h; sourceTree = "<group>"; };
+ 2B1217AB1827120D006F8EED /* keyinput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = keyinput.cpp; sourceTree = "<group>"; };
+ 2B1217AC1827120D006F8EED /* keyinput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keyinput.h; sourceTree = "<group>"; };
+ 2B1217AE1827120D006F8EED /* animationparticle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = animationparticle.cpp; sourceTree = "<group>"; };
+ 2B1217AF1827120D006F8EED /* animationparticle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = animationparticle.h; sourceTree = "<group>"; };
+ 2B1217B01827120D006F8EED /* imageparticle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imageparticle.cpp; sourceTree = "<group>"; };
+ 2B1217B11827120D006F8EED /* imageparticle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imageparticle.h; sourceTree = "<group>"; };
+ 2B1217B21827120D006F8EED /* particle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = particle.cpp; sourceTree = "<group>"; };
+ 2B1217B31827120D006F8EED /* particle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = particle.h; sourceTree = "<group>"; };
+ 2B1217B41827120D006F8EED /* particlecontainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = particlecontainer.cpp; sourceTree = "<group>"; };
+ 2B1217B51827120D006F8EED /* particlecontainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = particlecontainer.h; sourceTree = "<group>"; };
+ 2B1217B61827120D006F8EED /* particleemitter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = particleemitter.cpp; sourceTree = "<group>"; };
+ 2B1217B71827120D006F8EED /* particleemitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = particleemitter.h; sourceTree = "<group>"; };
+ 2B1217B81827120D006F8EED /* particleemitterprop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = particleemitterprop.h; sourceTree = "<group>"; };
+ 2B1217B91827120D006F8EED /* rotationalparticle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rotationalparticle.cpp; sourceTree = "<group>"; };
+ 2B1217BA1827120D006F8EED /* rotationalparticle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rotationalparticle.h; sourceTree = "<group>"; };
+ 2B1217BB1827120D006F8EED /* textparticle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = textparticle.cpp; sourceTree = "<group>"; };
+ 2B1217BC1827120D006F8EED /* textparticle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textparticle.h; sourceTree = "<group>"; };
+ 2B1217BE1827120D006F8EED /* graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = graphics.cpp; sourceTree = "<group>"; };
+ 2B1217BF1827120D006F8EED /* graphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = graphics.h; sourceTree = "<group>"; };
+ 2B1217C01827120D006F8EED /* mobileopenglgraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mobileopenglgraphics.cpp; sourceTree = "<group>"; };
+ 2B1217C11827120D006F8EED /* mobileopenglgraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mobileopenglgraphics.h; sourceTree = "<group>"; };
+ 2B1217C21827120D006F8EED /* normalopenglgraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = normalopenglgraphics.cpp; sourceTree = "<group>"; };
+ 2B1217C31827120D006F8EED /* normalopenglgraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = normalopenglgraphics.h; sourceTree = "<group>"; };
+ 2B1217C41827120D006F8EED /* nullopenglgraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nullopenglgraphics.cpp; sourceTree = "<group>"; };
+ 2B1217C51827120D006F8EED /* nullopenglgraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nullopenglgraphics.h; sourceTree = "<group>"; };
+ 2B1217C61827120D006F8EED /* renderers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = renderers.cpp; sourceTree = "<group>"; };
+ 2B1217C71827120D006F8EED /* renderers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = renderers.h; sourceTree = "<group>"; };
+ 2B1217C81827120D006F8EED /* rendererslistsdl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rendererslistsdl.h; sourceTree = "<group>"; };
+ 2B1217C91827120D006F8EED /* rendererslistsdl2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rendererslistsdl2.h; sourceTree = "<group>"; };
+ 2B1217CA1827120D006F8EED /* safeopenglgraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = safeopenglgraphics.cpp; sourceTree = "<group>"; };
+ 2B1217CB1827120D006F8EED /* safeopenglgraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = safeopenglgraphics.h; sourceTree = "<group>"; };
+ 2B1217CC1827120D006F8EED /* sdl2graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sdl2graphics.cpp; sourceTree = "<group>"; };
+ 2B1217CD1827120D006F8EED /* sdl2graphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdl2graphics.h; sourceTree = "<group>"; };
+ 2B1217CE1827120D006F8EED /* sdl2softwaregraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sdl2softwaregraphics.cpp; sourceTree = "<group>"; };
+ 2B1217CF1827120D006F8EED /* sdl2softwaregraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdl2softwaregraphics.h; sourceTree = "<group>"; };
+ 2B1217D01827120D006F8EED /* sdlgraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sdlgraphics.cpp; sourceTree = "<group>"; };
+ 2B1217D11827120D006F8EED /* sdlgraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdlgraphics.h; sourceTree = "<group>"; };
+ 2B1217D21827120D006F8EED /* surfacegraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = surfacegraphics.cpp; sourceTree = "<group>"; };
+ 2B1217D31827120D006F8EED /* surfacegraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = surfacegraphics.h; sourceTree = "<group>"; };
+ 2B121810182712A6006F8EED /* files.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = files.cpp; sourceTree = "<group>"; };
+ 2B121811182712A6006F8EED /* files.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = files.h; sourceTree = "<group>"; };
+ 2B121812182712A6006F8EED /* sdlcheckutils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sdlcheckutils.cpp; sourceTree = "<group>"; };
+ 2B121813182712A6006F8EED /* sdlcheckutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdlcheckutils.h; sourceTree = "<group>"; };
+ 2B121814182712A6006F8EED /* sdlhelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sdlhelper.cpp; sourceTree = "<group>"; };
+ 2B121815182712A6006F8EED /* physfscheckutils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = physfscheckutils.cpp; sourceTree = "<group>"; };
+ 2B121816182712A6006F8EED /* physfscheckutils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = physfscheckutils.h; sourceTree = "<group>"; };
+ 2B121817182712A6006F8EED /* sdl2helper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sdl2helper.cpp; sourceTree = "<group>"; };
+ 2B121818182712A6006F8EED /* sdl2helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdl2helper.h; sourceTree = "<group>"; };
+ 2B121819182712A6006F8EED /* sdlhelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdlhelper.h; sourceTree = "<group>"; };
+ 2B12181A182712A6006F8EED /* fuzzer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fuzzer.cpp; sourceTree = "<group>"; };
+ 2B12181B182712A6006F8EED /* fuzzer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fuzzer.h; sourceTree = "<group>"; };
+ 2B12182A182712DC006F8EED /* sdl2imagehelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdl2imagehelper.h; sourceTree = "<group>"; };
+ 2B12182B182712DC006F8EED /* sdl2softwareimagehelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdl2softwareimagehelper.h; sourceTree = "<group>"; };
+ 2B12182C182712DC006F8EED /* surfaceimagehelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = surfaceimagehelper.h; sourceTree = "<group>"; };
+ 2B12182D182712DC006F8EED /* beingcommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = beingcommon.cpp; sourceTree = "<group>"; };
+ 2B12182E182712DC006F8EED /* beingcommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = beingcommon.h; sourceTree = "<group>"; };
+ 2B12182F182712DC006F8EED /* sdl2imagehelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sdl2imagehelper.cpp; sourceTree = "<group>"; };
+ 2B121830182712DC006F8EED /* sdl2softwareimagehelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sdl2softwareimagehelper.cpp; sourceTree = "<group>"; };
+ 2B121831182712DC006F8EED /* surfaceimagehelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = surfaceimagehelper.cpp; sourceTree = "<group>"; };
+ 2B121832182712DC006F8EED /* dyecolor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dyecolor.h; sourceTree = "<group>"; };
+ 2B1218411827137F006F8EED /* colormodel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = colormodel.h; sourceTree = "<group>"; };
+ 2B1218421827137F006F8EED /* colorpage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = colorpage.cpp; sourceTree = "<group>"; };
+ 2B1218431827137F006F8EED /* colorpage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = colorpage.h; sourceTree = "<group>"; };
+ 2B1218441827137F006F8EED /* emotepage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = emotepage.cpp; sourceTree = "<group>"; };
+ 2B1218451827137F006F8EED /* emotepage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = emotepage.h; sourceTree = "<group>"; };
+ 2B1218461827137F006F8EED /* colormodel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = colormodel.cpp; sourceTree = "<group>"; };
2B17132F1686A98C002E9493 /* ManaPlus.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ManaPlus.app; sourceTree = BUILT_PRODUCTS_DIR; };
2B1713311686A98C002E9493 /* ManaPlus-10.6-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "ManaPlus-10.6-Info.plist"; path = "/Volumes/User/philippe_groarke/Documents/XCode/socapexs-manaplus/Xcode/ManaPlus-10.6-Info.plist"; sourceTree = "<absolute>"; };
- 2B1E2210172AF91A00B7230A /* sounddb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sounddb.cpp; sourceTree = "<group>"; };
- 2B1E2211172AF91A00B7230A /* sounddb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sounddb.h; sourceTree = "<group>"; };
2B1E2214172AF96000B7230A /* auctionmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = auctionmanager.cpp; path = ../../src/auctionmanager.cpp; sourceTree = "<group>"; };
2B1E2215172AF96000B7230A /* auctionmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = auctionmanager.h; path = ../../src/auctionmanager.h; sourceTree = "<group>"; };
2B1E2216172AF96000B7230A /* walklayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = walklayer.cpp; path = ../../src/walklayer.cpp; sourceTree = "<group>"; };
2B1E2217172AF96000B7230A /* walklayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = walklayer.h; path = ../../src/walklayer.h; sourceTree = "<group>"; };
- 2B1E221C172AF9E800B7230A /* langtab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = langtab.cpp; sourceTree = "<group>"; };
- 2B1E221D172AF9E800B7230A /* langtab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = langtab.h; sourceTree = "<group>"; };
2B1E2220172AFA2100B7230A /* navigationmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = navigationmanager.cpp; path = ../../src/navigationmanager.cpp; sourceTree = "<group>"; };
2B1E2221172AFA2100B7230A /* navigationmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = navigationmanager.h; path = ../../src/navigationmanager.h; sourceTree = "<group>"; };
- 2B1E2224172AFBB500B7230A /* petdb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = petdb.cpp; sourceTree = "<group>"; };
- 2B1E2225172AFBB500B7230A /* petdb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = petdb.h; sourceTree = "<group>"; };
2B1E2228172AFC4C00B7230A /* charserverhandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = charserverhandler.cpp; sourceTree = "<group>"; };
2B1E2229172AFC4C00B7230A /* charserverhandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = charserverhandler.h; sourceTree = "<group>"; };
2B1E222A172AFC4C00B7230A /* sdltcpnet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sdltcpnet.cpp; sourceTree = "<group>"; };
@@ -1226,8 +1267,6 @@
2B6B0E4F176BDD3000930985 /* cpu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cpu.cpp; sourceTree = "<group>"; };
2B6B0E50176BDD3000930985 /* cpu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpu.h; sourceTree = "<group>"; };
2B6B0E53176BDD5500930985 /* dragdrop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dragdrop.h; path = ../../src/dragdrop.h; sourceTree = "<group>"; };
- 2B6B0E54176BDD7B00930985 /* avatardb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = avatardb.cpp; sourceTree = "<group>"; };
- 2B6B0E55176BDD7B00930985 /* avatardb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avatardb.h; sourceTree = "<group>"; };
2B6B0E58176BDDC100930985 /* skilldata.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = skilldata.cpp; sourceTree = "<group>"; };
2B6B0E59176BDDC100930985 /* skilldata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = skilldata.h; sourceTree = "<group>"; };
2B6B0E5A176BDDC100930985 /* skillinfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = skillinfo.cpp; sourceTree = "<group>"; };
@@ -1236,7 +1275,6 @@
2B6B0E5D176BDDC100930985 /* skillmodel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = skillmodel.h; sourceTree = "<group>"; };
2B6B0E64176BDDE100930985 /* depricatedlistener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = depricatedlistener.cpp; path = ../../src/depricatedlistener.cpp; sourceTree = "<group>"; };
2B6B0E65176BDDE100930985 /* depricatedlistener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = depricatedlistener.h; path = ../../src/depricatedlistener.h; sourceTree = "<group>"; };
- 2B6B0E68176BDE0400930985 /* beingcacheentry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = beingcacheentry.h; path = ../../src/beingcacheentry.h; sourceTree = "<group>"; };
2B6B0E69176BDE0400930985 /* beingequipbackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = beingequipbackend.cpp; path = ../../src/beingequipbackend.cpp; sourceTree = "<group>"; };
2B6B0E6A176BDE0400930985 /* beingequipbackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = beingequipbackend.h; path = ../../src/beingequipbackend.h; sourceTree = "<group>"; };
2B6B0E6D176BDE2A00930985 /* characterdisplay.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = characterdisplay.cpp; sourceTree = "<group>"; };
@@ -1247,19 +1285,213 @@
2B6B0E72176BDE2A00930985 /* characterviewsmall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = characterviewsmall.cpp; sourceTree = "<group>"; };
2B6B0E73176BDE2A00930985 /* characterviewsmall.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = characterviewsmall.h; sourceTree = "<group>"; };
2B6B0E7A176BDEBE00930985 /* soundinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = soundinfo.h; sourceTree = "<group>"; };
+ 2B72F20118271656003A9FB7 /* beingpopup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = beingpopup.cpp; sourceTree = "<group>"; };
+ 2B72F20218271656003A9FB7 /* beingpopup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = beingpopup.h; sourceTree = "<group>"; };
+ 2B72F20318271656003A9FB7 /* itempopup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = itempopup.cpp; sourceTree = "<group>"; };
+ 2B72F20418271656003A9FB7 /* itempopup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = itempopup.h; sourceTree = "<group>"; };
+ 2B72F20518271656003A9FB7 /* popupmenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = popupmenu.cpp; sourceTree = "<group>"; };
+ 2B72F20618271656003A9FB7 /* popupmenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = popupmenu.h; sourceTree = "<group>"; };
+ 2B72F20718271656003A9FB7 /* speechbubble.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = speechbubble.cpp; sourceTree = "<group>"; };
+ 2B72F20818271656003A9FB7 /* speechbubble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speechbubble.h; sourceTree = "<group>"; };
+ 2B72F20918271656003A9FB7 /* spellpopup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = spellpopup.cpp; sourceTree = "<group>"; };
+ 2B72F20A18271656003A9FB7 /* spellpopup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = spellpopup.h; sourceTree = "<group>"; };
+ 2B72F20B18271656003A9FB7 /* statuspopup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = statuspopup.cpp; sourceTree = "<group>"; };
+ 2B72F20C18271656003A9FB7 /* statuspopup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = statuspopup.h; sourceTree = "<group>"; };
+ 2B72F20D18271656003A9FB7 /* textpopup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = textpopup.cpp; sourceTree = "<group>"; };
+ 2B72F20E18271656003A9FB7 /* textpopup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textpopup.h; sourceTree = "<group>"; };
+ 2B72F21018271656003A9FB7 /* botcheckerwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = botcheckerwindow.cpp; sourceTree = "<group>"; };
+ 2B72F21118271656003A9FB7 /* botcheckerwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = botcheckerwindow.h; sourceTree = "<group>"; };
+ 2B72F21218271656003A9FB7 /* buydialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = buydialog.cpp; sourceTree = "<group>"; };
+ 2B72F21318271656003A9FB7 /* buydialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = buydialog.h; sourceTree = "<group>"; };
+ 2B72F21418271656003A9FB7 /* buyselldialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = buyselldialog.cpp; sourceTree = "<group>"; };
+ 2B72F21518271656003A9FB7 /* buyselldialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = buyselldialog.h; sourceTree = "<group>"; };
+ 2B72F21618271656003A9FB7 /* changeemaildialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = changeemaildialog.cpp; sourceTree = "<group>"; };
+ 2B72F21718271656003A9FB7 /* changeemaildialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = changeemaildialog.h; sourceTree = "<group>"; };
+ 2B72F21818271656003A9FB7 /* changepassworddialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = changepassworddialog.cpp; sourceTree = "<group>"; };
+ 2B72F21918271656003A9FB7 /* changepassworddialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = changepassworddialog.h; sourceTree = "<group>"; };
+ 2B72F21A18271656003A9FB7 /* charcreatedialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = charcreatedialog.cpp; sourceTree = "<group>"; };
+ 2B72F21B18271656003A9FB7 /* charcreatedialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = charcreatedialog.h; sourceTree = "<group>"; };
+ 2B72F21C18271656003A9FB7 /* charselectdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = charselectdialog.cpp; sourceTree = "<group>"; };
+ 2B72F21D18271656003A9FB7 /* charselectdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = charselectdialog.h; sourceTree = "<group>"; };
+ 2B72F21E18271656003A9FB7 /* chatwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chatwindow.cpp; sourceTree = "<group>"; };
+ 2B72F21F18271656003A9FB7 /* chatwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chatwindow.h; sourceTree = "<group>"; };
+ 2B72F22018271656003A9FB7 /* confirmdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = confirmdialog.cpp; sourceTree = "<group>"; };
+ 2B72F22118271656003A9FB7 /* confirmdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = confirmdialog.h; sourceTree = "<group>"; };
+ 2B72F22218271656003A9FB7 /* connectiondialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = connectiondialog.cpp; sourceTree = "<group>"; };
+ 2B72F22318271656003A9FB7 /* connectiondialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = connectiondialog.h; sourceTree = "<group>"; };
+ 2B72F22418271656003A9FB7 /* debugwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debugwindow.cpp; sourceTree = "<group>"; };
+ 2B72F22518271656003A9FB7 /* debugwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debugwindow.h; sourceTree = "<group>"; };
+ 2B72F22618271656003A9FB7 /* didyouknowwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = didyouknowwindow.cpp; sourceTree = "<group>"; };
+ 2B72F22718271656003A9FB7 /* didyouknowwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = didyouknowwindow.h; sourceTree = "<group>"; };
+ 2B72F22818271656003A9FB7 /* editdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editdialog.cpp; sourceTree = "<group>"; };
+ 2B72F22918271656003A9FB7 /* editdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = editdialog.h; sourceTree = "<group>"; };
+ 2B72F22A18271656003A9FB7 /* editserverdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editserverdialog.cpp; sourceTree = "<group>"; };
+ 2B72F22B18271656003A9FB7 /* editserverdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = editserverdialog.h; sourceTree = "<group>"; };
+ 2B72F22C18271656003A9FB7 /* emotewindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = emotewindow.cpp; sourceTree = "<group>"; };
+ 2B72F22D18271656003A9FB7 /* emotewindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = emotewindow.h; sourceTree = "<group>"; };
+ 2B72F22E18271656003A9FB7 /* equipmentwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = equipmentwindow.cpp; sourceTree = "<group>"; };
+ 2B72F22F18271656003A9FB7 /* equipmentwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = equipmentwindow.h; sourceTree = "<group>"; };
+ 2B72F23018271656003A9FB7 /* helpwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = helpwindow.cpp; sourceTree = "<group>"; };
+ 2B72F23118271656003A9FB7 /* helpwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = helpwindow.h; sourceTree = "<group>"; };
+ 2B72F23218271656003A9FB7 /* inventorywindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inventorywindow.cpp; sourceTree = "<group>"; };
+ 2B72F23318271656003A9FB7 /* inventorywindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inventorywindow.h; sourceTree = "<group>"; };
+ 2B72F23418271656003A9FB7 /* itemamountwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = itemamountwindow.cpp; sourceTree = "<group>"; };
+ 2B72F23518271656003A9FB7 /* itemamountwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = itemamountwindow.h; sourceTree = "<group>"; };
+ 2B72F23618271656003A9FB7 /* killstats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = killstats.cpp; sourceTree = "<group>"; };
+ 2B72F23718271656003A9FB7 /* killstats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = killstats.h; sourceTree = "<group>"; };
+ 2B72F23818271656003A9FB7 /* logindialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = logindialog.cpp; sourceTree = "<group>"; };
+ 2B72F23918271656003A9FB7 /* logindialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = logindialog.h; sourceTree = "<group>"; };
+ 2B72F23A18271656003A9FB7 /* minimap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = minimap.cpp; sourceTree = "<group>"; };
+ 2B72F23B18271656003A9FB7 /* minimap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = minimap.h; sourceTree = "<group>"; };
+ 2B72F23C18271656003A9FB7 /* ministatuswindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ministatuswindow.cpp; sourceTree = "<group>"; };
+ 2B72F23D18271656003A9FB7 /* ministatuswindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ministatuswindow.h; sourceTree = "<group>"; };
+ 2B72F23E18271656003A9FB7 /* npcdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = npcdialog.cpp; sourceTree = "<group>"; };
+ 2B72F23F18271656003A9FB7 /* npcdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = npcdialog.h; sourceTree = "<group>"; };
+ 2B72F24018271656003A9FB7 /* npcpostdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = npcpostdialog.cpp; sourceTree = "<group>"; };
+ 2B72F24118271656003A9FB7 /* npcpostdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = npcpostdialog.h; sourceTree = "<group>"; };
+ 2B72F24218271656003A9FB7 /* okdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = okdialog.cpp; sourceTree = "<group>"; };
+ 2B72F24318271656003A9FB7 /* okdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = okdialog.h; sourceTree = "<group>"; };
+ 2B72F24418271656003A9FB7 /* outfitwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = outfitwindow.cpp; sourceTree = "<group>"; };
+ 2B72F24518271656003A9FB7 /* outfitwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = outfitwindow.h; sourceTree = "<group>"; };
+ 2B72F24618271656003A9FB7 /* questswindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = questswindow.cpp; sourceTree = "<group>"; };
+ 2B72F24718271656003A9FB7 /* questswindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = questswindow.h; sourceTree = "<group>"; };
+ 2B72F24818271656003A9FB7 /* quitdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = quitdialog.cpp; sourceTree = "<group>"; };
+ 2B72F24918271656003A9FB7 /* quitdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quitdialog.h; sourceTree = "<group>"; };
+ 2B72F24A18271656003A9FB7 /* registerdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = registerdialog.cpp; sourceTree = "<group>"; };
+ 2B72F24B18271656003A9FB7 /* registerdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = registerdialog.h; sourceTree = "<group>"; };
+ 2B72F24C18271656003A9FB7 /* selldialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = selldialog.cpp; sourceTree = "<group>"; };
+ 2B72F24D18271656003A9FB7 /* selldialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = selldialog.h; sourceTree = "<group>"; };
+ 2B72F24E18271656003A9FB7 /* serverdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = serverdialog.cpp; sourceTree = "<group>"; };
+ 2B72F24F18271656003A9FB7 /* serverdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = serverdialog.h; sourceTree = "<group>"; };
+ 2B72F25018271656003A9FB7 /* setup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup.cpp; sourceTree = "<group>"; };
+ 2B72F25118271656003A9FB7 /* setup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup.h; sourceTree = "<group>"; };
+ 2B72F25218271656003A9FB7 /* shopwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = shopwindow.cpp; sourceTree = "<group>"; };
+ 2B72F25318271656003A9FB7 /* shopwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shopwindow.h; sourceTree = "<group>"; };
+ 2B72F25418271656003A9FB7 /* shortcutwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = shortcutwindow.cpp; sourceTree = "<group>"; };
+ 2B72F25518271656003A9FB7 /* shortcutwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shortcutwindow.h; sourceTree = "<group>"; };
+ 2B72F25618271656003A9FB7 /* skilldialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = skilldialog.cpp; sourceTree = "<group>"; };
+ 2B72F25718271656003A9FB7 /* skilldialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = skilldialog.h; sourceTree = "<group>"; };
+ 2B72F25818271656003A9FB7 /* socialwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = socialwindow.cpp; sourceTree = "<group>"; };
+ 2B72F25918271656003A9FB7 /* socialwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = socialwindow.h; sourceTree = "<group>"; };
+ 2B72F25A18271656003A9FB7 /* statuswindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = statuswindow.cpp; sourceTree = "<group>"; };
+ 2B72F25B18271656003A9FB7 /* statuswindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = statuswindow.h; sourceTree = "<group>"; };
+ 2B72F25C18271656003A9FB7 /* textcommandeditor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = textcommandeditor.cpp; sourceTree = "<group>"; };
+ 2B72F25D18271656003A9FB7 /* textcommandeditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textcommandeditor.h; sourceTree = "<group>"; };
+ 2B72F25E18271656003A9FB7 /* textdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = textdialog.cpp; sourceTree = "<group>"; };
+ 2B72F25F18271656003A9FB7 /* textdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textdialog.h; sourceTree = "<group>"; };
+ 2B72F26018271656003A9FB7 /* tradewindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tradewindow.cpp; sourceTree = "<group>"; };
+ 2B72F26118271656003A9FB7 /* tradewindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tradewindow.h; sourceTree = "<group>"; };
+ 2B72F26218271656003A9FB7 /* unregisterdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unregisterdialog.cpp; sourceTree = "<group>"; };
+ 2B72F26318271656003A9FB7 /* unregisterdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unregisterdialog.h; sourceTree = "<group>"; };
+ 2B72F26418271656003A9FB7 /* updaterwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = updaterwindow.cpp; sourceTree = "<group>"; };
+ 2B72F26518271656003A9FB7 /* updaterwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = updaterwindow.h; sourceTree = "<group>"; };
+ 2B72F26618271656003A9FB7 /* whoisonline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = whoisonline.cpp; sourceTree = "<group>"; };
+ 2B72F26718271656003A9FB7 /* whoisonline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = whoisonline.h; sourceTree = "<group>"; };
+ 2B72F26818271656003A9FB7 /* worldselectdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = worldselectdialog.cpp; sourceTree = "<group>"; };
+ 2B72F26918271656003A9FB7 /* worldselectdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = worldselectdialog.h; sourceTree = "<group>"; };
+ 2B72F2D2182716C1003A9FB7 /* actormanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = actormanager.cpp; path = ../../src/actormanager.cpp; sourceTree = "<group>"; };
+ 2B72F2D3182716C1003A9FB7 /* eventsmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = eventsmanager.cpp; path = ../../src/eventsmanager.cpp; sourceTree = "<group>"; };
+ 2B72F2D4182716C1003A9FB7 /* eventsmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = eventsmanager.h; path = ../../src/eventsmanager.h; sourceTree = "<group>"; };
+ 2B72F2D5182716C1003A9FB7 /* actormanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = actormanager.h; path = ../../src/actormanager.h; sourceTree = "<group>"; };
+ 2B72F2D6182716C1003A9FB7 /* itemsoundmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = itemsoundmanager.cpp; path = ../../src/itemsoundmanager.cpp; sourceTree = "<group>"; };
+ 2B72F2D7182716C1003A9FB7 /* itemsoundmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = itemsoundmanager.h; path = ../../src/itemsoundmanager.h; sourceTree = "<group>"; };
+ 2B72F2D8182716C1003A9FB7 /* sdlshared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sdlshared.h; path = ../../src/sdlshared.h; sourceTree = "<group>"; };
+ 2B72F2D9182716C1003A9FB7 /* soundconsts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = soundconsts.h; path = ../../src/soundconsts.h; sourceTree = "<group>"; };
+ 2B72F2E9182716F1003A9FB7 /* multitouchmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = multitouchmanager.cpp; sourceTree = "<group>"; };
+ 2B72F2EA182716F1003A9FB7 /* multitouchmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = multitouchmanager.h; sourceTree = "<group>"; };
+ 2B72F2EE18271727003A9FB7 /* avatardb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = avatardb.cpp; sourceTree = "<group>"; };
+ 2B72F2EF18271727003A9FB7 /* avatardb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avatardb.h; sourceTree = "<group>"; };
+ 2B72F2F018271727003A9FB7 /* chardb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chardb.cpp; sourceTree = "<group>"; };
+ 2B72F2F118271727003A9FB7 /* chardb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chardb.h; sourceTree = "<group>"; };
+ 2B72F2F218271727003A9FB7 /* colordb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = colordb.cpp; sourceTree = "<group>"; };
+ 2B72F2F318271727003A9FB7 /* colordb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = colordb.h; sourceTree = "<group>"; };
+ 2B72F2F418271727003A9FB7 /* deaddb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = deaddb.cpp; sourceTree = "<group>"; };
+ 2B72F2F518271727003A9FB7 /* deaddb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = deaddb.h; sourceTree = "<group>"; };
+ 2B72F2F618271727003A9FB7 /* emotedb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = emotedb.cpp; sourceTree = "<group>"; };
+ 2B72F2F718271727003A9FB7 /* emotedb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = emotedb.h; sourceTree = "<group>"; };
+ 2B72F2F818271727003A9FB7 /* itemdb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = itemdb.cpp; sourceTree = "<group>"; };
+ 2B72F2F918271727003A9FB7 /* itemdb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = itemdb.h; sourceTree = "<group>"; };
+ 2B72F2FA18271727003A9FB7 /* mapdb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mapdb.cpp; sourceTree = "<group>"; };
+ 2B72F2FB18271727003A9FB7 /* mapdb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mapdb.h; sourceTree = "<group>"; };
+ 2B72F2FC18271727003A9FB7 /* monsterdb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = monsterdb.cpp; sourceTree = "<group>"; };
+ 2B72F2FD18271727003A9FB7 /* monsterdb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = monsterdb.h; sourceTree = "<group>"; };
+ 2B72F2FE18271727003A9FB7 /* npcdb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = npcdb.cpp; sourceTree = "<group>"; };
+ 2B72F2FF18271727003A9FB7 /* npcdb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = npcdb.h; sourceTree = "<group>"; };
+ 2B72F30018271727003A9FB7 /* palettedb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = palettedb.cpp; sourceTree = "<group>"; };
+ 2B72F30118271727003A9FB7 /* palettedb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = palettedb.h; sourceTree = "<group>"; };
+ 2B72F30218271727003A9FB7 /* petdb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = petdb.cpp; sourceTree = "<group>"; };
+ 2B72F30318271727003A9FB7 /* petdb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = petdb.h; sourceTree = "<group>"; };
+ 2B72F30418271727003A9FB7 /* sounddb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sounddb.cpp; sourceTree = "<group>"; };
+ 2B72F30518271727003A9FB7 /* sounddb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sounddb.h; sourceTree = "<group>"; };
+ 2B72F31E1827173C003A9FB7 /* mgl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mgl.cpp; sourceTree = "<group>"; };
+ 2B72F31F1827173C003A9FB7 /* mgl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mgl.h; sourceTree = "<group>"; };
+ 2B72F3231827175B003A9FB7 /* battletab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = battletab.cpp; sourceTree = "<group>"; };
+ 2B72F3241827175B003A9FB7 /* battletab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = battletab.h; sourceTree = "<group>"; };
+ 2B72F3251827175B003A9FB7 /* chattab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chattab.cpp; sourceTree = "<group>"; };
+ 2B72F3261827175B003A9FB7 /* chattab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chattab.h; sourceTree = "<group>"; };
+ 2B72F3271827175B003A9FB7 /* gmtab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gmtab.cpp; sourceTree = "<group>"; };
+ 2B72F3281827175B003A9FB7 /* gmtab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gmtab.h; sourceTree = "<group>"; };
+ 2B72F3291827175B003A9FB7 /* guildchattab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = guildchattab.cpp; sourceTree = "<group>"; };
+ 2B72F32A1827175B003A9FB7 /* guildchattab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = guildchattab.h; sourceTree = "<group>"; };
+ 2B72F32B1827175B003A9FB7 /* langtab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = langtab.cpp; sourceTree = "<group>"; };
+ 2B72F32C1827175B003A9FB7 /* langtab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = langtab.h; sourceTree = "<group>"; };
+ 2B72F32D1827175B003A9FB7 /* setup_audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_audio.cpp; sourceTree = "<group>"; };
+ 2B72F32E1827175B003A9FB7 /* setup_audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_audio.h; sourceTree = "<group>"; };
+ 2B72F32F1827175B003A9FB7 /* setup_chat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_chat.cpp; sourceTree = "<group>"; };
+ 2B72F3301827175B003A9FB7 /* setup_chat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_chat.h; sourceTree = "<group>"; };
+ 2B72F3311827175B003A9FB7 /* setup_colors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_colors.cpp; sourceTree = "<group>"; };
+ 2B72F3321827175B003A9FB7 /* setup_colors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_colors.h; sourceTree = "<group>"; };
+ 2B72F3331827175B003A9FB7 /* setup_input.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_input.cpp; sourceTree = "<group>"; };
+ 2B72F3341827175B003A9FB7 /* setup_input.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_input.h; sourceTree = "<group>"; };
+ 2B72F3351827175B003A9FB7 /* setup_joystick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_joystick.cpp; sourceTree = "<group>"; };
+ 2B72F3361827175B003A9FB7 /* setup_joystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_joystick.h; sourceTree = "<group>"; };
+ 2B72F3371827175B003A9FB7 /* setup_other.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_other.cpp; sourceTree = "<group>"; };
+ 2B72F3381827175B003A9FB7 /* setup_other.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_other.h; sourceTree = "<group>"; };
+ 2B72F3391827175B003A9FB7 /* setup_perfomance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_perfomance.cpp; sourceTree = "<group>"; };
+ 2B72F33A1827175B003A9FB7 /* setup_perfomance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_perfomance.h; sourceTree = "<group>"; };
+ 2B72F33B1827175B003A9FB7 /* setup_players.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_players.cpp; sourceTree = "<group>"; };
+ 2B72F33C1827175B003A9FB7 /* setup_players.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_players.h; sourceTree = "<group>"; };
+ 2B72F33D1827175B003A9FB7 /* setup_relations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_relations.cpp; sourceTree = "<group>"; };
+ 2B72F33E1827175B003A9FB7 /* setup_relations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_relations.h; sourceTree = "<group>"; };
+ 2B72F33F1827175B003A9FB7 /* setup_theme.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_theme.cpp; sourceTree = "<group>"; };
+ 2B72F3401827175B003A9FB7 /* setup_theme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_theme.h; sourceTree = "<group>"; };
+ 2B72F3411827175B003A9FB7 /* setup_touch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_touch.cpp; sourceTree = "<group>"; };
+ 2B72F3421827175B003A9FB7 /* setup_touch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_touch.h; sourceTree = "<group>"; };
+ 2B72F3431827175B003A9FB7 /* setup_video.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_video.cpp; sourceTree = "<group>"; };
+ 2B72F3441827175B003A9FB7 /* setup_video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_video.h; sourceTree = "<group>"; };
+ 2B72F3451827175B003A9FB7 /* setup_visual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_visual.cpp; sourceTree = "<group>"; };
+ 2B72F3461827175B003A9FB7 /* setup_visual.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_visual.h; sourceTree = "<group>"; };
+ 2B72F3471827175B003A9FB7 /* setuptab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setuptab.cpp; sourceTree = "<group>"; };
+ 2B72F3481827175B003A9FB7 /* setuptab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setuptab.h; sourceTree = "<group>"; };
+ 2B72F3491827175B003A9FB7 /* setuptabscroll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setuptabscroll.cpp; sourceTree = "<group>"; };
+ 2B72F34A1827175B003A9FB7 /* setuptabscroll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setuptabscroll.h; sourceTree = "<group>"; };
+ 2B72F34B1827175B003A9FB7 /* tab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tab.cpp; sourceTree = "<group>"; };
+ 2B72F34C1827175B003A9FB7 /* tab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tab.h; sourceTree = "<group>"; };
+ 2B72F34D1827175B003A9FB7 /* tradetab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tradetab.cpp; sourceTree = "<group>"; };
+ 2B72F34E1827175B003A9FB7 /* tradetab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tradetab.h; sourceTree = "<group>"; };
+ 2B72F34F1827175B003A9FB7 /* whispertab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = whispertab.cpp; sourceTree = "<group>"; };
+ 2B72F3501827175B003A9FB7 /* whispertab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = whispertab.h; sourceTree = "<group>"; };
2B7A5E5B16D82A3E0020A1C1 /* physfstools.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = physfstools.cpp; sourceTree = "<group>"; };
2B7A5E5C16D82A3E0020A1C1 /* physfstools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = physfstools.h; sourceTree = "<group>"; };
- 2B7A5E5F16D82C010020A1C1 /* gmtab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gmtab.cpp; sourceTree = "<group>"; };
- 2B7A5E6016D82C010020A1C1 /* gmtab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gmtab.h; sourceTree = "<group>"; };
2B8B70C9167EBCB3003A8440 /* popuplist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = popuplist.cpp; sourceTree = "<group>"; };
2B8B70CA167EBCB3003A8440 /* popuplist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = popuplist.h; sourceTree = "<group>"; };
- 2B8B70CC167EBE3A003A8440 /* setup_touch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_touch.cpp; sourceTree = "<group>"; };
- 2B8B70CD167EBE3A003A8440 /* setup_touch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_touch.h; sourceTree = "<group>"; };
+ 2B9A1A46188F3D40005F72F1 /* setup_mods.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_mods.cpp; sourceTree = "<group>"; };
+ 2B9A1A47188F3D40005F72F1 /* setup_mods.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_mods.h; sourceTree = "<group>"; };
+ 2B9A1A4A188F3D72005F72F1 /* graphics_calcImageRect.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = graphics_calcImageRect.hpp; sourceTree = "<group>"; };
+ 2B9A1A4B188F3D72005F72F1 /* graphics_drawImageRect.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = graphics_drawImageRect.hpp; sourceTree = "<group>"; };
+ 2B9A1A4C188F3D72005F72F1 /* openglgraphicsdef.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = openglgraphicsdef.hpp; sourceTree = "<group>"; };
+ 2B9A1A4D188F3D9F005F72F1 /* netconsts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = netconsts.h; sourceTree = "<group>"; };
+ 2B9A1A4E188F3D9F005F72F1 /* pethandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pethandler.h; sourceTree = "<group>"; };
+ 2B9A1A4F188F3DAD005F72F1 /* pethandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pethandler.cpp; sourceTree = "<group>"; };
+ 2B9A1A50188F3DAD005F72F1 /* pethandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pethandler.h; sourceTree = "<group>"; };
+ 2B9A1A53188F3DC6005F72F1 /* particleinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = particleinfo.h; sourceTree = "<group>"; };
+ 2B9A1A54188F3DE6005F72F1 /* timer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timer.cpp; sourceTree = "<group>"; };
+ 2B9A1A55188F3DE6005F72F1 /* timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = timer.h; sourceTree = "<group>"; };
+ 2B9A1A58188F3EC6005F72F1 /* modinfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = modinfo.cpp; sourceTree = "<group>"; };
+ 2B9A1A59188F3EC6005F72F1 /* modinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = modinfo.h; sourceTree = "<group>"; };
+ 2B9A1A5C188F3EE4005F72F1 /* moddb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = moddb.cpp; sourceTree = "<group>"; };
+ 2B9A1A5D188F3EE4005F72F1 /* moddb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = moddb.h; sourceTree = "<group>"; };
2BAC2B43166DB4B300874178 /* manaplus.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = manaplus.icns; sourceTree = "<group>"; };
- 2BB28FB0172B43860046599B /* palettedb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = palettedb.cpp; sourceTree = "<group>"; };
- 2BB28FB1172B43860046599B /* palettedb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = palettedb.h; sourceTree = "<group>"; };
- 2BB28FB4172B4CEF0046599B /* nullopenglgraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = nullopenglgraphics.cpp; path = ../../src/nullopenglgraphics.cpp; sourceTree = "<group>"; };
- 2BB28FB5172B4CEF0046599B /* nullopenglgraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = nullopenglgraphics.h; path = ../../src/nullopenglgraphics.h; sourceTree = "<group>"; };
2BC90AA916855F8000FE7AD3 /* libintl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libintl.a; path = libs/libintl.a; sourceTree = "<group>"; };
2BDF45BF166D5AEC0054E77F /* ManaPlus.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ManaPlus.app; sourceTree = BUILT_PRODUCTS_DIR; };
2BDF45C3166D5AEC0054E77F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
@@ -1281,23 +1513,12 @@
2BDF45ED166D5AEC0054E77F /* ManaPlusTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ManaPlusTests.m; sourceTree = "<group>"; };
2BDF4755166D5B680054E77F /* actionmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = actionmanager.cpp; path = ../../src/actionmanager.cpp; sourceTree = "<group>"; };
2BDF4756166D5B680054E77F /* actionmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = actionmanager.h; path = ../../src/actionmanager.h; sourceTree = "<group>"; };
- 2BDF4757166D5B680054E77F /* actor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = actor.cpp; path = ../../src/actor.cpp; sourceTree = "<group>"; };
- 2BDF4758166D5B680054E77F /* actor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = actor.h; path = ../../src/actor.h; sourceTree = "<group>"; };
- 2BDF4759166D5B680054E77F /* actorsprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = actorsprite.cpp; path = ../../src/actorsprite.cpp; sourceTree = "<group>"; };
- 2BDF475A166D5B680054E77F /* actorsprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = actorsprite.h; path = ../../src/actorsprite.h; sourceTree = "<group>"; };
- 2BDF475B166D5B680054E77F /* actorspritelistener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = actorspritelistener.h; path = ../../src/actorspritelistener.h; sourceTree = "<group>"; };
- 2BDF475C166D5B680054E77F /* actorspritemanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = actorspritemanager.cpp; path = ../../src/actorspritemanager.cpp; sourceTree = "<group>"; };
- 2BDF475D166D5B680054E77F /* actorspritemanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = actorspritemanager.h; path = ../../src/actorspritemanager.h; sourceTree = "<group>"; };
2BDF475E166D5B680054E77F /* animatedsprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = animatedsprite.cpp; path = ../../src/animatedsprite.cpp; sourceTree = "<group>"; };
2BDF475F166D5B680054E77F /* animatedsprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = animatedsprite.h; path = ../../src/animatedsprite.h; sourceTree = "<group>"; };
2BDF4760166D5B680054E77F /* animationdelayload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = animationdelayload.cpp; path = ../../src/animationdelayload.cpp; sourceTree = "<group>"; };
2BDF4761166D5B680054E77F /* animationdelayload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = animationdelayload.h; path = ../../src/animationdelayload.h; sourceTree = "<group>"; };
- 2BDF4762166D5B680054E77F /* animationparticle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = animationparticle.cpp; path = ../../src/animationparticle.cpp; sourceTree = "<group>"; };
- 2BDF4763166D5B680054E77F /* animationparticle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = animationparticle.h; path = ../../src/animationparticle.h; sourceTree = "<group>"; };
2BDF4766166D5B680054E77F /* avatar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = avatar.cpp; path = ../../src/avatar.cpp; sourceTree = "<group>"; };
2BDF4767166D5B680054E77F /* avatar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = avatar.h; path = ../../src/avatar.h; sourceTree = "<group>"; };
- 2BDF4768166D5B680054E77F /* being.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = being.cpp; path = ../../src/being.cpp; sourceTree = "<group>"; };
- 2BDF4769166D5B680054E77F /* being.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = being.h; path = ../../src/being.h; sourceTree = "<group>"; };
2BDF476E166D5B680054E77F /* chatlogger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = chatlogger.cpp; path = ../../src/chatlogger.cpp; sourceTree = "<group>"; };
2BDF476F166D5B680054E77F /* chatlogger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = chatlogger.h; path = ../../src/chatlogger.h; sourceTree = "<group>"; };
2BDF4770166D5B680054E77F /* client.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = client.cpp; path = ../../src/client.cpp; sourceTree = "<group>"; };
@@ -1306,8 +1527,6 @@
2BDF4773166D5B680054E77F /* commandhandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = commandhandler.h; path = ../../src/commandhandler.h; sourceTree = "<group>"; };
2BDF4774166D5B680054E77F /* commands.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = commands.cpp; path = ../../src/commands.cpp; sourceTree = "<group>"; };
2BDF4775166D5B680054E77F /* commands.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = commands.h; path = ../../src/commands.h; sourceTree = "<group>"; };
- 2BDF4776166D5B680054E77F /* compoundsprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = compoundsprite.cpp; path = ../../src/compoundsprite.cpp; sourceTree = "<group>"; };
- 2BDF4777166D5B680054E77F /* compoundsprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = compoundsprite.h; path = ../../src/compoundsprite.h; sourceTree = "<group>"; };
2BDF4778166D5B680054E77F /* configlistener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = configlistener.h; path = ../../src/configlistener.h; sourceTree = "<group>"; };
2BDF4779166D5B680054E77F /* configuration.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = configuration.cpp; path = ../../src/configuration.cpp; sourceTree = "<group>"; };
2BDF477A166D5B680054E77F /* configuration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = configuration.h; path = ../../src/configuration.h; sourceTree = "<group>"; };
@@ -1331,164 +1550,34 @@
2BDF478F166D5B680054E77F /* flooritem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = flooritem.h; path = ../../src/flooritem.h; sourceTree = "<group>"; };
2BDF4790166D5B680054E77F /* game.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = game.cpp; path = ../../src/game.cpp; sourceTree = "<group>"; };
2BDF4791166D5B680054E77F /* game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = game.h; path = ../../src/game.h; sourceTree = "<group>"; };
- 2BDF4792166D5B680054E77F /* graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = graphics.cpp; path = ../../src/graphics.cpp; sourceTree = "<group>"; };
- 2BDF4793166D5B680054E77F /* graphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = graphics.h; path = ../../src/graphics.h; sourceTree = "<group>"; };
2BDF4794166D5B680054E77F /* graphicsmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = graphicsmanager.cpp; path = ../../src/graphicsmanager.cpp; sourceTree = "<group>"; };
2BDF4795166D5B680054E77F /* graphicsmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = graphicsmanager.h; path = ../../src/graphicsmanager.h; sourceTree = "<group>"; };
2BDF4796166D5B680054E77F /* graphicsvertexes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = graphicsvertexes.cpp; path = ../../src/graphicsvertexes.cpp; sourceTree = "<group>"; };
2BDF4797166D5B680054E77F /* graphicsvertexes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = graphicsvertexes.h; path = ../../src/graphicsvertexes.h; sourceTree = "<group>"; };
- 2BDF4799166D5B680054E77F /* beingpopup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = beingpopup.cpp; sourceTree = "<group>"; };
- 2BDF479A166D5B680054E77F /* beingpopup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = beingpopup.h; sourceTree = "<group>"; };
- 2BDF479B166D5B680054E77F /* botcheckerwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = botcheckerwindow.cpp; sourceTree = "<group>"; };
- 2BDF479C166D5B680054E77F /* botcheckerwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = botcheckerwindow.h; sourceTree = "<group>"; };
- 2BDF479D166D5B680054E77F /* buydialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = buydialog.cpp; sourceTree = "<group>"; };
- 2BDF479E166D5B680054E77F /* buydialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = buydialog.h; sourceTree = "<group>"; };
- 2BDF479F166D5B680054E77F /* buyselldialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = buyselldialog.cpp; sourceTree = "<group>"; };
- 2BDF47A0166D5B680054E77F /* buyselldialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = buyselldialog.h; sourceTree = "<group>"; };
- 2BDF47A1166D5B680054E77F /* changeemaildialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = changeemaildialog.cpp; sourceTree = "<group>"; };
- 2BDF47A2166D5B680054E77F /* changeemaildialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = changeemaildialog.h; sourceTree = "<group>"; };
- 2BDF47A3166D5B680054E77F /* changepassworddialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = changepassworddialog.cpp; sourceTree = "<group>"; };
- 2BDF47A4166D5B680054E77F /* changepassworddialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = changepassworddialog.h; sourceTree = "<group>"; };
- 2BDF47A5166D5B680054E77F /* charcreatedialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = charcreatedialog.cpp; sourceTree = "<group>"; };
- 2BDF47A6166D5B680054E77F /* charcreatedialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = charcreatedialog.h; sourceTree = "<group>"; };
- 2BDF47A7166D5B680054E77F /* charselectdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = charselectdialog.cpp; sourceTree = "<group>"; };
- 2BDF47A8166D5B680054E77F /* charselectdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = charselectdialog.h; sourceTree = "<group>"; };
- 2BDF47A9166D5B680054E77F /* chatwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chatwindow.cpp; sourceTree = "<group>"; };
- 2BDF47AA166D5B680054E77F /* chatwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chatwindow.h; sourceTree = "<group>"; };
- 2BDF47AB166D5B680054E77F /* confirmdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = confirmdialog.cpp; sourceTree = "<group>"; };
- 2BDF47AC166D5B680054E77F /* confirmdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = confirmdialog.h; sourceTree = "<group>"; };
- 2BDF47AD166D5B680054E77F /* connectiondialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = connectiondialog.cpp; sourceTree = "<group>"; };
- 2BDF47AE166D5B680054E77F /* connectiondialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = connectiondialog.h; sourceTree = "<group>"; };
- 2BDF47AF166D5B680054E77F /* debugwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = debugwindow.cpp; sourceTree = "<group>"; };
- 2BDF47B0166D5B680054E77F /* debugwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = debugwindow.h; sourceTree = "<group>"; };
- 2BDF47B1166D5B680054E77F /* didyouknowwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = didyouknowwindow.cpp; sourceTree = "<group>"; };
- 2BDF47B2166D5B680054E77F /* didyouknowwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = didyouknowwindow.h; sourceTree = "<group>"; };
- 2BDF47B3166D5B680054E77F /* editdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editdialog.cpp; sourceTree = "<group>"; };
- 2BDF47B4166D5B680054E77F /* editdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = editdialog.h; sourceTree = "<group>"; };
- 2BDF47B5166D5B680054E77F /* editserverdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editserverdialog.cpp; sourceTree = "<group>"; };
- 2BDF47B6166D5B680054E77F /* editserverdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = editserverdialog.h; sourceTree = "<group>"; };
- 2BDF47B7166D5B680054E77F /* equipmentwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = equipmentwindow.cpp; sourceTree = "<group>"; };
- 2BDF47B8166D5B680054E77F /* equipmentwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = equipmentwindow.h; sourceTree = "<group>"; };
2BDF47B9166D5B680054E77F /* focushandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = focushandler.cpp; sourceTree = "<group>"; };
2BDF47BA166D5B680054E77F /* focushandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = focushandler.h; sourceTree = "<group>"; };
2BDF47BB166D5B680054E77F /* gui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gui.cpp; sourceTree = "<group>"; };
2BDF47BC166D5B680054E77F /* gui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gui.h; sourceTree = "<group>"; };
- 2BDF47BD166D5B680054E77F /* helpwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = helpwindow.cpp; sourceTree = "<group>"; };
- 2BDF47BE166D5B680054E77F /* helpwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = helpwindow.h; sourceTree = "<group>"; };
- 2BDF47BF166D5B680054E77F /* inventorywindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = inventorywindow.cpp; sourceTree = "<group>"; };
- 2BDF47C0166D5B680054E77F /* inventorywindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = inventorywindow.h; sourceTree = "<group>"; };
- 2BDF47C1166D5B680054E77F /* itemamountwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = itemamountwindow.cpp; sourceTree = "<group>"; };
- 2BDF47C2166D5B680054E77F /* itemamountwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = itemamountwindow.h; sourceTree = "<group>"; };
- 2BDF47C3166D5B680054E77F /* itempopup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = itempopup.cpp; sourceTree = "<group>"; };
- 2BDF47C4166D5B680054E77F /* itempopup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = itempopup.h; sourceTree = "<group>"; };
- 2BDF47C5166D5B680054E77F /* killstats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = killstats.cpp; sourceTree = "<group>"; };
- 2BDF47C6166D5B680054E77F /* killstats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = killstats.h; sourceTree = "<group>"; };
- 2BDF47C7166D5B680054E77F /* logindialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = logindialog.cpp; sourceTree = "<group>"; };
- 2BDF47C8166D5B680054E77F /* logindialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = logindialog.h; sourceTree = "<group>"; };
- 2BDF47C9166D5B680054E77F /* minimap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = minimap.cpp; sourceTree = "<group>"; };
- 2BDF47CA166D5B680054E77F /* minimap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = minimap.h; sourceTree = "<group>"; };
- 2BDF47CB166D5B680054E77F /* ministatuswindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ministatuswindow.cpp; sourceTree = "<group>"; };
- 2BDF47CC166D5B680054E77F /* ministatuswindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ministatuswindow.h; sourceTree = "<group>"; };
- 2BDF47CD166D5B680054E77F /* npcdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = npcdialog.cpp; sourceTree = "<group>"; };
- 2BDF47CE166D5B680054E77F /* npcdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = npcdialog.h; sourceTree = "<group>"; };
- 2BDF47CF166D5B680054E77F /* npcpostdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = npcpostdialog.cpp; sourceTree = "<group>"; };
- 2BDF47D0166D5B680054E77F /* npcpostdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = npcpostdialog.h; sourceTree = "<group>"; };
- 2BDF47D1166D5B680054E77F /* okdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = okdialog.cpp; sourceTree = "<group>"; };
- 2BDF47D2166D5B680054E77F /* okdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = okdialog.h; sourceTree = "<group>"; };
- 2BDF47D3166D5B680054E77F /* outfitwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = outfitwindow.cpp; sourceTree = "<group>"; };
- 2BDF47D4166D5B680054E77F /* outfitwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = outfitwindow.h; sourceTree = "<group>"; };
2BDF47D5166D5B680054E77F /* palette.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = palette.cpp; sourceTree = "<group>"; };
2BDF47D6166D5B680054E77F /* palette.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = palette.h; sourceTree = "<group>"; };
- 2BDF47D7166D5B680054E77F /* popupmenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = popupmenu.cpp; sourceTree = "<group>"; };
- 2BDF47D8166D5B680054E77F /* popupmenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = popupmenu.h; sourceTree = "<group>"; };
- 2BDF47D9166D5B680054E77F /* questswindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = questswindow.cpp; sourceTree = "<group>"; };
- 2BDF47DA166D5B680054E77F /* questswindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = questswindow.h; sourceTree = "<group>"; };
- 2BDF47DB166D5B680054E77F /* quitdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = quitdialog.cpp; sourceTree = "<group>"; };
- 2BDF47DC166D5B680054E77F /* quitdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quitdialog.h; sourceTree = "<group>"; };
- 2BDF47DD166D5B680054E77F /* registerdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = registerdialog.cpp; sourceTree = "<group>"; };
- 2BDF47DE166D5B680054E77F /* registerdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = registerdialog.h; sourceTree = "<group>"; };
2BDF47DF166D5B680054E77F /* sdlfont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sdlfont.cpp; sourceTree = "<group>"; };
2BDF47E0166D5B680054E77F /* sdlfont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdlfont.h; sourceTree = "<group>"; };
2BDF47E1166D5B680054E77F /* sdlinput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sdlinput.cpp; sourceTree = "<group>"; };
2BDF47E2166D5B680054E77F /* sdlinput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sdlinput.h; sourceTree = "<group>"; };
- 2BDF47E3166D5B680054E77F /* selldialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = selldialog.cpp; sourceTree = "<group>"; };
- 2BDF47E4166D5B680054E77F /* selldialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = selldialog.h; sourceTree = "<group>"; };
- 2BDF47E5166D5B680054E77F /* serverdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = serverdialog.cpp; sourceTree = "<group>"; };
- 2BDF47E6166D5B680054E77F /* serverdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = serverdialog.h; sourceTree = "<group>"; };
- 2BDF47E7166D5B680054E77F /* setup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup.cpp; sourceTree = "<group>"; };
- 2BDF47E8166D5B680054E77F /* setup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup.h; sourceTree = "<group>"; };
- 2BDF47E9166D5B680054E77F /* setup_audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_audio.cpp; sourceTree = "<group>"; };
- 2BDF47EA166D5B680054E77F /* setup_audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_audio.h; sourceTree = "<group>"; };
- 2BDF47EB166D5B680054E77F /* setup_chat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_chat.cpp; sourceTree = "<group>"; };
- 2BDF47EC166D5B680054E77F /* setup_chat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_chat.h; sourceTree = "<group>"; };
- 2BDF47ED166D5B680054E77F /* setup_colors.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_colors.cpp; sourceTree = "<group>"; };
- 2BDF47EE166D5B680054E77F /* setup_colors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_colors.h; sourceTree = "<group>"; };
- 2BDF47EF166D5B680054E77F /* setup_input.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_input.cpp; sourceTree = "<group>"; };
- 2BDF47F0166D5B680054E77F /* setup_input.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_input.h; sourceTree = "<group>"; };
- 2BDF47F1166D5B680054E77F /* setup_joystick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_joystick.cpp; sourceTree = "<group>"; };
- 2BDF47F2166D5B680054E77F /* setup_joystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_joystick.h; sourceTree = "<group>"; };
- 2BDF47F3166D5B680054E77F /* setup_other.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_other.cpp; sourceTree = "<group>"; };
- 2BDF47F4166D5B680054E77F /* setup_other.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_other.h; sourceTree = "<group>"; };
- 2BDF47F5166D5B680054E77F /* setup_perfomance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_perfomance.cpp; sourceTree = "<group>"; };
- 2BDF47F6166D5B680054E77F /* setup_perfomance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_perfomance.h; sourceTree = "<group>"; };
- 2BDF47F7166D5B680054E77F /* setup_players.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_players.cpp; sourceTree = "<group>"; };
- 2BDF47F8166D5B680054E77F /* setup_players.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_players.h; sourceTree = "<group>"; };
- 2BDF47F9166D5B680054E77F /* setup_relations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_relations.cpp; sourceTree = "<group>"; };
- 2BDF47FA166D5B680054E77F /* setup_relations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_relations.h; sourceTree = "<group>"; };
- 2BDF47FB166D5B680054E77F /* setup_theme.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_theme.cpp; sourceTree = "<group>"; };
- 2BDF47FC166D5B680054E77F /* setup_theme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_theme.h; sourceTree = "<group>"; };
- 2BDF47FD166D5B680054E77F /* setup_video.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_video.cpp; sourceTree = "<group>"; };
- 2BDF47FE166D5B680054E77F /* setup_video.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_video.h; sourceTree = "<group>"; };
- 2BDF47FF166D5B680054E77F /* setup_visual.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setup_visual.cpp; sourceTree = "<group>"; };
- 2BDF4800166D5B680054E77F /* setup_visual.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setup_visual.h; sourceTree = "<group>"; };
2BDF4801166D5B680054E77F /* setupactiondata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setupactiondata.h; sourceTree = "<group>"; };
- 2BDF4802166D5B680054E77F /* shopwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = shopwindow.cpp; sourceTree = "<group>"; };
- 2BDF4803166D5B680054E77F /* shopwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shopwindow.h; sourceTree = "<group>"; };
- 2BDF4804166D5B680054E77F /* shortcutwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = shortcutwindow.cpp; sourceTree = "<group>"; };
- 2BDF4805166D5B680054E77F /* shortcutwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shortcutwindow.h; sourceTree = "<group>"; };
- 2BDF4806166D5B680054E77F /* skilldialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = skilldialog.cpp; sourceTree = "<group>"; };
- 2BDF4807166D5B680054E77F /* skilldialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = skilldialog.h; sourceTree = "<group>"; };
- 2BDF4808166D5B680054E77F /* socialwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = socialwindow.cpp; sourceTree = "<group>"; };
- 2BDF4809166D5B680054E77F /* socialwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = socialwindow.h; sourceTree = "<group>"; };
- 2BDF480C166D5B680054E77F /* speechbubble.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = speechbubble.cpp; sourceTree = "<group>"; };
- 2BDF480D166D5B680054E77F /* speechbubble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = speechbubble.h; sourceTree = "<group>"; };
- 2BDF480E166D5B680054E77F /* spellpopup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = spellpopup.cpp; sourceTree = "<group>"; };
- 2BDF480F166D5B680054E77F /* spellpopup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = spellpopup.h; sourceTree = "<group>"; };
- 2BDF4810166D5B680054E77F /* statuspopup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = statuspopup.cpp; sourceTree = "<group>"; };
- 2BDF4811166D5B680054E77F /* statuspopup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = statuspopup.h; sourceTree = "<group>"; };
- 2BDF4812166D5B680054E77F /* statuswindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = statuswindow.cpp; sourceTree = "<group>"; };
- 2BDF4813166D5B680054E77F /* statuswindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = statuswindow.h; sourceTree = "<group>"; };
- 2BDF4814166D5B680054E77F /* textcommandeditor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = textcommandeditor.cpp; sourceTree = "<group>"; };
- 2BDF4815166D5B680054E77F /* textcommandeditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textcommandeditor.h; sourceTree = "<group>"; };
- 2BDF4816166D5B680054E77F /* textdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = textdialog.cpp; sourceTree = "<group>"; };
- 2BDF4817166D5B680054E77F /* textdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textdialog.h; sourceTree = "<group>"; };
- 2BDF4818166D5B680054E77F /* textpopup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = textpopup.cpp; sourceTree = "<group>"; };
- 2BDF4819166D5B680054E77F /* textpopup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textpopup.h; sourceTree = "<group>"; };
2BDF481A166D5B680054E77F /* theme.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = theme.cpp; sourceTree = "<group>"; };
2BDF481B166D5B680054E77F /* theme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = theme.h; sourceTree = "<group>"; };
- 2BDF481C166D5B680054E77F /* tradewindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tradewindow.cpp; sourceTree = "<group>"; };
- 2BDF481D166D5B680054E77F /* tradewindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tradewindow.h; sourceTree = "<group>"; };
- 2BDF481E166D5B680054E77F /* unregisterdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unregisterdialog.cpp; sourceTree = "<group>"; };
- 2BDF481F166D5B680054E77F /* unregisterdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unregisterdialog.h; sourceTree = "<group>"; };
- 2BDF4820166D5B680054E77F /* updaterwindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = updaterwindow.cpp; sourceTree = "<group>"; };
- 2BDF4821166D5B680054E77F /* updaterwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = updaterwindow.h; sourceTree = "<group>"; };
2BDF4822166D5B680054E77F /* userpalette.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = userpalette.cpp; sourceTree = "<group>"; };
2BDF4823166D5B680054E77F /* userpalette.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = userpalette.h; sourceTree = "<group>"; };
2BDF4824166D5B680054E77F /* viewport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = viewport.cpp; sourceTree = "<group>"; };
2BDF4825166D5B680054E77F /* viewport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = viewport.h; sourceTree = "<group>"; };
- 2BDF4826166D5B680054E77F /* whoisonline.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = whoisonline.cpp; sourceTree = "<group>"; };
- 2BDF4827166D5B680054E77F /* whoisonline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = whoisonline.h; sourceTree = "<group>"; };
2BDF4829166D5B680054E77F /* avatarlistbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = avatarlistbox.cpp; sourceTree = "<group>"; };
2BDF482A166D5B680054E77F /* avatarlistbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = avatarlistbox.h; sourceTree = "<group>"; };
- 2BDF482B166D5B680054E77F /* battletab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = battletab.cpp; sourceTree = "<group>"; };
- 2BDF482C166D5B680054E77F /* battletab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = battletab.h; sourceTree = "<group>"; };
2BDF482D166D5B680054E77F /* browserbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = browserbox.cpp; sourceTree = "<group>"; };
2BDF482E166D5B680054E77F /* browserbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = browserbox.h; sourceTree = "<group>"; };
2BDF482F166D5B680054E77F /* browserbox_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = browserbox_unittest.cc; sourceTree = "<group>"; };
2BDF4830166D5B680054E77F /* button.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = button.cpp; sourceTree = "<group>"; };
2BDF4831166D5B680054E77F /* button.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = button.h; sourceTree = "<group>"; };
- 2BDF4834166D5B680054E77F /* chattab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chattab.cpp; sourceTree = "<group>"; };
- 2BDF4835166D5B680054E77F /* chattab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chattab.h; sourceTree = "<group>"; };
2BDF4836166D5B680054E77F /* checkbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = checkbox.cpp; sourceTree = "<group>"; };
2BDF4837166D5B680054E77F /* checkbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = checkbox.h; sourceTree = "<group>"; };
2BDF4838166D5B680054E77F /* container.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = container.cpp; sourceTree = "<group>"; };
@@ -1508,8 +1597,6 @@
2BDF4846166D5B680054E77F /* extendednamesmodel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = extendednamesmodel.h; sourceTree = "<group>"; };
2BDF4847166D5B680054E77F /* flowcontainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = flowcontainer.cpp; sourceTree = "<group>"; };
2BDF4848166D5B680054E77F /* flowcontainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = flowcontainer.h; sourceTree = "<group>"; };
- 2BDF4849166D5B680054E77F /* guildchattab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = guildchattab.cpp; sourceTree = "<group>"; };
- 2BDF484A166D5B680054E77F /* guildchattab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = guildchattab.h; sourceTree = "<group>"; };
2BDF484B166D5B680054E77F /* guitable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = guitable.cpp; sourceTree = "<group>"; };
2BDF484C166D5B680054E77F /* guitable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = guitable.h; sourceTree = "<group>"; };
2BDF484D166D5B680054E77F /* horizontcontainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = horizontcontainer.cpp; sourceTree = "<group>"; };
@@ -1554,10 +1641,6 @@
2BDF4874166D5B680054E77F /* scrollarea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scrollarea.h; sourceTree = "<group>"; };
2BDF4875166D5B680054E77F /* setupitem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setupitem.cpp; sourceTree = "<group>"; };
2BDF4876166D5B680054E77F /* setupitem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setupitem.h; sourceTree = "<group>"; };
- 2BDF4877166D5B680054E77F /* setuptab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setuptab.cpp; sourceTree = "<group>"; };
- 2BDF4878166D5B680054E77F /* setuptab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setuptab.h; sourceTree = "<group>"; };
- 2BDF4879166D5B680054E77F /* setuptabscroll.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = setuptabscroll.cpp; sourceTree = "<group>"; };
- 2BDF487A166D5B680054E77F /* setuptabscroll.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = setuptabscroll.h; sourceTree = "<group>"; };
2BDF487B166D5B680054E77F /* shopitems.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = shopitems.cpp; sourceTree = "<group>"; };
2BDF487C166D5B680054E77F /* shopitems.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shopitems.h; sourceTree = "<group>"; };
2BDF487D166D5B680054E77F /* shoplistbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = shoplistbox.cpp; sourceTree = "<group>"; };
@@ -1570,8 +1653,6 @@
2BDF4884166D5B680054E77F /* sliderlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sliderlist.h; sourceTree = "<group>"; };
2BDF4885166D5B680054E77F /* spellshortcutcontainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = spellshortcutcontainer.cpp; sourceTree = "<group>"; };
2BDF4886166D5B680054E77F /* spellshortcutcontainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = spellshortcutcontainer.h; sourceTree = "<group>"; };
- 2BDF4887166D5B680054E77F /* tab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tab.cpp; sourceTree = "<group>"; };
- 2BDF4888166D5B680054E77F /* tab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tab.h; sourceTree = "<group>"; };
2BDF4889166D5B680054E77F /* tabbedarea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tabbedarea.cpp; sourceTree = "<group>"; };
2BDF488A166D5B680054E77F /* tabbedarea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tabbedarea.h; sourceTree = "<group>"; };
2BDF488B166D5B680054E77F /* tablemodel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tablemodel.cpp; sourceTree = "<group>"; };
@@ -1584,12 +1665,8 @@
2BDF4892166D5B680054E77F /* textfield.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textfield.h; sourceTree = "<group>"; };
2BDF4893166D5B680054E77F /* textpreview.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = textpreview.cpp; sourceTree = "<group>"; };
2BDF4894166D5B680054E77F /* textpreview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = textpreview.h; sourceTree = "<group>"; };
- 2BDF4895166D5B680054E77F /* tradetab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tradetab.cpp; sourceTree = "<group>"; };
- 2BDF4896166D5B680054E77F /* tradetab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tradetab.h; sourceTree = "<group>"; };
2BDF4897166D5B680054E77F /* vertcontainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vertcontainer.cpp; sourceTree = "<group>"; };
2BDF4898166D5B680054E77F /* vertcontainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vertcontainer.h; sourceTree = "<group>"; };
- 2BDF4899166D5B680054E77F /* whispertab.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = whispertab.cpp; sourceTree = "<group>"; };
- 2BDF489A166D5B680054E77F /* whispertab.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = whispertab.h; sourceTree = "<group>"; };
2BDF489B166D5B680054E77F /* widget2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = widget2.h; sourceTree = "<group>"; };
2BDF489C166D5B680054E77F /* widgetgroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = widgetgroup.cpp; sourceTree = "<group>"; };
2BDF489D166D5B680054E77F /* widgetgroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = widgetgroup.h; sourceTree = "<group>"; };
@@ -1599,8 +1676,6 @@
2BDF48A1166D5B680054E77F /* windowcontainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = windowcontainer.h; sourceTree = "<group>"; };
2BDF48A2166D5B680054E77F /* windowmenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = windowmenu.cpp; sourceTree = "<group>"; };
2BDF48A3166D5B680054E77F /* windowmenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = windowmenu.h; sourceTree = "<group>"; };
- 2BDF48A4166D5B680054E77F /* worldselectdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = worldselectdialog.cpp; sourceTree = "<group>"; };
- 2BDF48A5166D5B680054E77F /* worldselectdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = worldselectdialog.h; sourceTree = "<group>"; };
2BDF48A7166D5B680054E77F /* actionevent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = actionevent.cpp; sourceTree = "<group>"; };
2BDF48A8166D5B680054E77F /* basiccontainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = basiccontainer.cpp; sourceTree = "<group>"; };
2BDF48A9166D5B680054E77F /* cliprectangle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cliprectangle.cpp; sourceTree = "<group>"; };
@@ -1663,13 +1738,11 @@
2BDF48E6166D5B680054E77F /* mouseevent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mouseevent.cpp; sourceTree = "<group>"; };
2BDF48E7166D5B680054E77F /* mouseinput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mouseinput.cpp; sourceTree = "<group>"; };
2BDF48E8166D5B680054E77F /* rectangle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = rectangle.cpp; sourceTree = "<group>"; };
- 2BDF48EA166D5B680054E77F /* sdlgraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sdlgraphics.cpp; sourceTree = "<group>"; };
2BDF48EB166D5B680054E77F /* selectionevent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = selectionevent.cpp; sourceTree = "<group>"; };
2BDF48EC166D5B680054E77F /* widget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = widget.cpp; sourceTree = "<group>"; };
2BDF48EE166D5B680054E77F /* button.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = button.cpp; sourceTree = "<group>"; };
2BDF48EF166D5B680054E77F /* checkbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = checkbox.cpp; sourceTree = "<group>"; };
2BDF48F0166D5B680054E77F /* container.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = container.cpp; sourceTree = "<group>"; };
- 2BDF48F1166D5B680054E77F /* dropdown.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dropdown.cpp; sourceTree = "<group>"; };
2BDF48F2166D5B680054E77F /* label.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = label.cpp; sourceTree = "<group>"; };
2BDF48F3166D5B680054E77F /* listbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = listbox.cpp; sourceTree = "<group>"; };
2BDF48F4166D5B680054E77F /* radiobutton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = radiobutton.cpp; sourceTree = "<group>"; };
@@ -1682,33 +1755,15 @@
2BDF48FB166D5B680054E77F /* guild.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = guild.h; path = ../../src/guild.h; sourceTree = "<group>"; };
2BDF48FC166D5B680054E77F /* guildmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = guildmanager.cpp; path = ../../src/guildmanager.cpp; sourceTree = "<group>"; };
2BDF48FD166D5B680054E77F /* guildmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = guildmanager.h; path = ../../src/guildmanager.h; sourceTree = "<group>"; };
- 2BDF48FE166D5B680054E77F /* imageparticle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = imageparticle.cpp; path = ../../src/imageparticle.cpp; sourceTree = "<group>"; };
- 2BDF48FF166D5B680054E77F /* imageparticle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imageparticle.h; path = ../../src/imageparticle.h; sourceTree = "<group>"; };
2BDF4900166D5B680054E77F /* imagesprite.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = imagesprite.cpp; path = ../../src/imagesprite.cpp; sourceTree = "<group>"; };
2BDF4901166D5B680054E77F /* imagesprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = imagesprite.h; path = ../../src/imagesprite.h; sourceTree = "<group>"; };
- 2BDF4902166D5B680054E77F /* inputevent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = inputevent.cpp; path = ../../src/inputevent.cpp; sourceTree = "<group>"; };
- 2BDF4903166D5B680054E77F /* inputevent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = inputevent.h; path = ../../src/inputevent.h; sourceTree = "<group>"; };
- 2BDF4904166D5B680054E77F /* inputmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = inputmanager.cpp; path = ../../src/inputmanager.cpp; sourceTree = "<group>"; };
- 2BDF4905166D5B680054E77F /* inputmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = inputmanager.h; path = ../../src/inputmanager.h; sourceTree = "<group>"; };
2BDF4906166D5B680054E77F /* inventory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = inventory.cpp; path = ../../src/inventory.cpp; sourceTree = "<group>"; };
2BDF4907166D5B680054E77F /* inventory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = inventory.h; path = ../../src/inventory.h; sourceTree = "<group>"; };
2BDF4908166D5B680054E77F /* item.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = item.cpp; path = ../../src/item.cpp; sourceTree = "<group>"; };
2BDF4909166D5B680054E77F /* item.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = item.h; path = ../../src/item.h; sourceTree = "<group>"; };
2BDF490A166D5B680054E77F /* itemshortcut.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = itemshortcut.cpp; path = ../../src/itemshortcut.cpp; sourceTree = "<group>"; };
2BDF490B166D5B680054E77F /* itemshortcut.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = itemshortcut.h; path = ../../src/itemshortcut.h; sourceTree = "<group>"; };
- 2BDF490C166D5B680054E77F /* joystick.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = joystick.cpp; path = ../../src/joystick.cpp; sourceTree = "<group>"; };
- 2BDF490D166D5B680054E77F /* joystick.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = joystick.h; path = ../../src/joystick.h; sourceTree = "<group>"; };
- 2BDF490E166D5B680054E77F /* keyboardconfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = keyboardconfig.cpp; path = ../../src/keyboardconfig.cpp; sourceTree = "<group>"; };
- 2BDF490F166D5B680054E77F /* keyboardconfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = keyboardconfig.h; path = ../../src/keyboardconfig.h; sourceTree = "<group>"; };
- 2BDF4910166D5B680054E77F /* keyboarddata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = keyboarddata.h; path = ../../src/keyboarddata.h; sourceTree = "<group>"; };
- 2BDF4911166D5B680054E77F /* keydata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = keydata.h; path = ../../src/keydata.h; sourceTree = "<group>"; };
- 2BDF4912166D5B680054E77F /* keyevent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = keyevent.cpp; path = ../../src/keyevent.cpp; sourceTree = "<group>"; };
- 2BDF4913166D5B680054E77F /* keyevent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = keyevent.h; path = ../../src/keyevent.h; sourceTree = "<group>"; };
- 2BDF4914166D5B680054E77F /* keyinput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = keyinput.cpp; path = ../../src/keyinput.cpp; sourceTree = "<group>"; };
- 2BDF4915166D5B680054E77F /* keyinput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = keyinput.h; path = ../../src/keyinput.h; sourceTree = "<group>"; };
2BDF4918166D5B680054E77F /* localconsts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = localconsts.h; path = ../../src/localconsts.h; sourceTree = "<group>"; };
- 2BDF4919166D5B680054E77F /* localplayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = localplayer.cpp; path = ../../src/localplayer.cpp; sourceTree = "<group>"; };
- 2BDF491A166D5B680054E77F /* localplayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = localplayer.h; path = ../../src/localplayer.h; sourceTree = "<group>"; };
2BDF491B166D5B680054E77F /* logger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = logger.cpp; path = ../../src/logger.cpp; sourceTree = "<group>"; };
2BDF491C166D5B680054E77F /* logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = logger.h; path = ../../src/logger.h; sourceTree = "<group>"; };
2BDF491D166D5B680054E77F /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../../src/main.cpp; sourceTree = "<group>"; };
@@ -1717,10 +1772,6 @@
2BDF4920166D5B680054E77F /* map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = map.h; path = ../../src/map.h; sourceTree = "<group>"; };
2BDF4921166D5B680054E77F /* maplayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = maplayer.cpp; path = ../../src/maplayer.cpp; sourceTree = "<group>"; };
2BDF4922166D5B680054E77F /* maplayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = maplayer.h; path = ../../src/maplayer.h; sourceTree = "<group>"; };
- 2BDF4923166D5B680054E77F /* mgl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mgl.cpp; path = ../../src/mgl.cpp; sourceTree = "<group>"; };
- 2BDF4924166D5B680054E77F /* mgl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mgl.h; path = ../../src/mgl.h; sourceTree = "<group>"; };
- 2BDF4925166D5B680054E77F /* mobileopenglgraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mobileopenglgraphics.cpp; path = ../../src/mobileopenglgraphics.cpp; sourceTree = "<group>"; };
- 2BDF4926166D5B680054E77F /* mobileopenglgraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mobileopenglgraphics.h; path = ../../src/mobileopenglgraphics.h; sourceTree = "<group>"; };
2BDF4927166D5B680054E77F /* mouseinput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mouseinput.cpp; path = ../../src/mouseinput.cpp; sourceTree = "<group>"; };
2BDF4928166D5B680054E77F /* mouseinput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mouseinput.h; path = ../../src/mouseinput.h; sourceTree = "<group>"; };
2BDF4929166D5B680054E77F /* mumblemanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mumblemanager.cpp; path = ../../src/mumblemanager.cpp; sourceTree = "<group>"; };
@@ -1876,21 +1927,8 @@
2BDF49CF166D5B680054E77F /* tradehandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tradehandler.h; sourceTree = "<group>"; };
2BDF49D0166D5B680054E77F /* tradehandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tradehandler.h; sourceTree = "<group>"; };
2BDF49D1166D5B680054E77F /* worldinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = worldinfo.h; sourceTree = "<group>"; };
- 2BDF49D2166D5B680054E77F /* normalopenglgraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = normalopenglgraphics.cpp; path = ../../src/normalopenglgraphics.cpp; sourceTree = "<group>"; };
- 2BDF49D3166D5B680054E77F /* normalopenglgraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = normalopenglgraphics.h; path = ../../src/normalopenglgraphics.h; sourceTree = "<group>"; };
- 2BDF49D4166D5B680054E77F /* particle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = particle.cpp; path = ../../src/particle.cpp; sourceTree = "<group>"; };
- 2BDF49D5166D5B680054E77F /* particle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = particle.h; path = ../../src/particle.h; sourceTree = "<group>"; };
- 2BDF49D6166D5B680054E77F /* particlecontainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = particlecontainer.cpp; path = ../../src/particlecontainer.cpp; sourceTree = "<group>"; };
- 2BDF49D7166D5B680054E77F /* particlecontainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = particlecontainer.h; path = ../../src/particlecontainer.h; sourceTree = "<group>"; };
- 2BDF49D8166D5B680054E77F /* particleemitter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = particleemitter.cpp; path = ../../src/particleemitter.cpp; sourceTree = "<group>"; };
- 2BDF49D9166D5B680054E77F /* particleemitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = particleemitter.h; path = ../../src/particleemitter.h; sourceTree = "<group>"; };
- 2BDF49DA166D5B680054E77F /* particleemitterprop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = particleemitterprop.h; path = ../../src/particleemitterprop.h; sourceTree = "<group>"; };
2BDF49DB166D5B680054E77F /* party.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = party.cpp; path = ../../src/party.cpp; sourceTree = "<group>"; };
2BDF49DC166D5B680054E77F /* party.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = party.h; path = ../../src/party.h; sourceTree = "<group>"; };
- 2BDF49DD166D5B680054E77F /* playerinfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = playerinfo.cpp; path = ../../src/playerinfo.cpp; sourceTree = "<group>"; };
- 2BDF49DE166D5B680054E77F /* playerinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = playerinfo.h; path = ../../src/playerinfo.h; sourceTree = "<group>"; };
- 2BDF49DF166D5B680054E77F /* playerrelations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = playerrelations.cpp; path = ../../src/playerrelations.cpp; sourceTree = "<group>"; };
- 2BDF49E0166D5B680054E77F /* playerrelations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = playerrelations.h; path = ../../src/playerrelations.h; sourceTree = "<group>"; };
2BDF49E1166D5B680054E77F /* position.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = position.cpp; path = ../../src/position.cpp; sourceTree = "<group>"; };
2BDF49E2166D5B680054E77F /* position.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = position.h; path = ../../src/position.h; sourceTree = "<group>"; };
2BDF49E3166D5B680054E77F /* properties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = properties.h; path = ../../src/properties.h; sourceTree = "<group>"; };
@@ -1904,16 +1942,10 @@
2BDF49EC166D5B680054E77F /* atlasmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = atlasmanager.h; sourceTree = "<group>"; };
2BDF49ED166D5B680054E77F /* beinginfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = beinginfo.cpp; sourceTree = "<group>"; };
2BDF49EE166D5B680054E77F /* beinginfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = beinginfo.h; sourceTree = "<group>"; };
- 2BDF49EF166D5B680054E77F /* chardb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chardb.cpp; sourceTree = "<group>"; };
- 2BDF49F0166D5B680054E77F /* chardb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chardb.h; sourceTree = "<group>"; };
- 2BDF49F1166D5B680054E77F /* colordb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = colordb.cpp; sourceTree = "<group>"; };
- 2BDF49F2166D5B680054E77F /* colordb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = colordb.h; sourceTree = "<group>"; };
2BDF49F3166D5B680054E77F /* cursor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cursor.cpp; sourceTree = "<group>"; };
2BDF49F4166D5B680054E77F /* cursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cursor.h; sourceTree = "<group>"; };
2BDF49F5166D5B680054E77F /* dye.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dye.cpp; sourceTree = "<group>"; };
2BDF49F6166D5B680054E77F /* dye.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dye.h; sourceTree = "<group>"; };
- 2BDF49F7166D5B680054E77F /* emotedb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = emotedb.cpp; sourceTree = "<group>"; };
- 2BDF49F8166D5B680054E77F /* emotedb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = emotedb.h; sourceTree = "<group>"; };
2BDF49F9166D5B680054E77F /* fboinfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fboinfo.h; sourceTree = "<group>"; };
2BDF49FA166D5B680054E77F /* image.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = image.cpp; sourceTree = "<group>"; };
2BDF49FB166D5B680054E77F /* image.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = image.h; sourceTree = "<group>"; };
@@ -1923,18 +1955,10 @@
2BDF49FF166D5B680054E77F /* imageset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imageset.h; sourceTree = "<group>"; };
2BDF4A00166D5B680054E77F /* imagewriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = imagewriter.cpp; sourceTree = "<group>"; };
2BDF4A01166D5B680054E77F /* imagewriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = imagewriter.h; sourceTree = "<group>"; };
- 2BDF4A02166D5B680054E77F /* itemdb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = itemdb.cpp; sourceTree = "<group>"; };
- 2BDF4A03166D5B680054E77F /* itemdb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = itemdb.h; sourceTree = "<group>"; };
2BDF4A04166D5B680054E77F /* iteminfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iteminfo.cpp; sourceTree = "<group>"; };
2BDF4A05166D5B680054E77F /* iteminfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iteminfo.h; sourceTree = "<group>"; };
- 2BDF4A06166D5B680054E77F /* mapdb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mapdb.cpp; sourceTree = "<group>"; };
- 2BDF4A07166D5B680054E77F /* mapdb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mapdb.h; sourceTree = "<group>"; };
2BDF4A08166D5B680054E77F /* mapreader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mapreader.cpp; sourceTree = "<group>"; };
2BDF4A09166D5B680054E77F /* mapreader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mapreader.h; sourceTree = "<group>"; };
- 2BDF4A0A166D5B680054E77F /* monsterdb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = monsterdb.cpp; sourceTree = "<group>"; };
- 2BDF4A0B166D5B680054E77F /* monsterdb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = monsterdb.h; sourceTree = "<group>"; };
- 2BDF4A0C166D5B680054E77F /* npcdb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = npcdb.cpp; sourceTree = "<group>"; };
- 2BDF4A0D166D5B680054E77F /* npcdb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = npcdb.h; sourceTree = "<group>"; };
2BDF4A0E166D5B680054E77F /* openglimagehelper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = openglimagehelper.cpp; sourceTree = "<group>"; };
2BDF4A0F166D5B680054E77F /* openglimagehelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = openglimagehelper.h; sourceTree = "<group>"; };
2BDF4A10166D5B680054E77F /* resource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource.cpp; sourceTree = "<group>"; };
@@ -1953,10 +1977,6 @@
2BDF4A1F166D5B680054E77F /* subimage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = subimage.h; sourceTree = "<group>"; };
2BDF4A20166D5B680054E77F /* wallpaper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wallpaper.cpp; sourceTree = "<group>"; };
2BDF4A21166D5B680054E77F /* wallpaper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wallpaper.h; sourceTree = "<group>"; };
- 2BDF4A22166D5B680054E77F /* rotationalparticle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = rotationalparticle.cpp; path = ../../src/rotationalparticle.cpp; sourceTree = "<group>"; };
- 2BDF4A23166D5B680054E77F /* rotationalparticle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rotationalparticle.h; path = ../../src/rotationalparticle.h; sourceTree = "<group>"; };
- 2BDF4A24166D5B680054E77F /* safeopenglgraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = safeopenglgraphics.cpp; path = ../../src/safeopenglgraphics.cpp; sourceTree = "<group>"; };
- 2BDF4A25166D5B680054E77F /* safeopenglgraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = safeopenglgraphics.h; path = ../../src/safeopenglgraphics.h; sourceTree = "<group>"; };
2BDF4A26166D5B680054E77F /* SDLMain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDLMain.h; path = ../../src/SDLMain.h; sourceTree = "<group>"; };
2BDF4A27166D5B680054E77F /* SDLMain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLMain.m; path = ../../src/SDLMain.m; sourceTree = "<group>"; };
2BDF4A28166D5B680054E77F /* shopitem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = shopitem.cpp; path = ../../src/shopitem.cpp; sourceTree = "<group>"; };
@@ -1982,8 +2002,6 @@
2BDF4A3D166D5B680054E77F /* textcommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = textcommand.h; path = ../../src/textcommand.h; sourceTree = "<group>"; };
2BDF4A3E166D5B680054E77F /* textmanager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = textmanager.cpp; path = ../../src/textmanager.cpp; sourceTree = "<group>"; };
2BDF4A3F166D5B680054E77F /* textmanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = textmanager.h; path = ../../src/textmanager.h; sourceTree = "<group>"; };
- 2BDF4A40166D5B680054E77F /* textparticle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = textparticle.cpp; path = ../../src/textparticle.cpp; sourceTree = "<group>"; };
- 2BDF4A41166D5B680054E77F /* textparticle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = textparticle.h; path = ../../src/textparticle.h; sourceTree = "<group>"; };
2BDF4A43166D5B680054E77F /* tileset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = tileset.h; path = ../../src/tileset.h; sourceTree = "<group>"; };
2BDF4A44166D5B680054E77F /* touchactions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = touchactions.cpp; path = ../../src/touchactions.cpp; sourceTree = "<group>"; };
2BDF4A45166D5B680054E77F /* touchactions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = touchactions.h; path = ../../src/touchactions.h; sourceTree = "<group>"; };
@@ -2090,6 +2108,319 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
+ 2B12178D1827120D006F8EED /* being */ = {
+ isa = PBXGroup;
+ children = (
+ 2B12178E1827120D006F8EED /* actor.cpp */,
+ 2B12178F1827120D006F8EED /* actor.h */,
+ 2B1217901827120D006F8EED /* actorsprite.cpp */,
+ 2B1217911827120D006F8EED /* actorsprite.h */,
+ 2B1217921827120D006F8EED /* actorspritelistener.h */,
+ 2B1217931827120D006F8EED /* being.cpp */,
+ 2B1217941827120D006F8EED /* being.h */,
+ 2B1217951827120D006F8EED /* beingcacheentry.h */,
+ 2B1217961827120D006F8EED /* compoundsprite.cpp */,
+ 2B1217971827120D006F8EED /* compoundsprite.h */,
+ 2B1217981827120D006F8EED /* localplayer.cpp */,
+ 2B1217991827120D006F8EED /* localplayer.h */,
+ 2B12179A1827120D006F8EED /* playerinfo.cpp */,
+ 2B12179B1827120D006F8EED /* playerinfo.h */,
+ 2B12179C1827120D006F8EED /* playerrelations.cpp */,
+ 2B12179D1827120D006F8EED /* playerrelations.h */,
+ );
+ name = being;
+ path = ../../src/being;
+ sourceTree = "<group>";
+ };
+ 2B12179E1827120D006F8EED /* input */ = {
+ isa = PBXGroup;
+ children = (
+ 2B72F2E9182716F1003A9FB7 /* multitouchmanager.cpp */,
+ 2B72F2EA182716F1003A9FB7 /* multitouchmanager.h */,
+ 2B12179F1827120D006F8EED /* inputevent.cpp */,
+ 2B1217A01827120D006F8EED /* inputevent.h */,
+ 2B1217A11827120D006F8EED /* inputmanager.cpp */,
+ 2B1217A21827120D006F8EED /* inputmanager.h */,
+ 2B1217A31827120D006F8EED /* joystick.cpp */,
+ 2B1217A41827120D006F8EED /* joystick.h */,
+ 2B1217A51827120D006F8EED /* keyboardconfig.cpp */,
+ 2B1217A61827120D006F8EED /* keyboardconfig.h */,
+ 2B1217A71827120D006F8EED /* keyboarddata.h */,
+ 2B1217A81827120D006F8EED /* keydata.h */,
+ 2B1217A91827120D006F8EED /* keyevent.cpp */,
+ 2B1217AA1827120D006F8EED /* keyevent.h */,
+ 2B1217AB1827120D006F8EED /* keyinput.cpp */,
+ 2B1217AC1827120D006F8EED /* keyinput.h */,
+ );
+ name = input;
+ path = ../../src/input;
+ sourceTree = "<group>";
+ };
+ 2B1217AD1827120D006F8EED /* particle */ = {
+ isa = PBXGroup;
+ children = (
+ 2B9A1A53188F3DC6005F72F1 /* particleinfo.h */,
+ 2B1217AE1827120D006F8EED /* animationparticle.cpp */,
+ 2B1217AF1827120D006F8EED /* animationparticle.h */,
+ 2B1217B01827120D006F8EED /* imageparticle.cpp */,
+ 2B1217B11827120D006F8EED /* imageparticle.h */,
+ 2B1217B21827120D006F8EED /* particle.cpp */,
+ 2B1217B31827120D006F8EED /* particle.h */,
+ 2B1217B41827120D006F8EED /* particlecontainer.cpp */,
+ 2B1217B51827120D006F8EED /* particlecontainer.h */,
+ 2B1217B61827120D006F8EED /* particleemitter.cpp */,
+ 2B1217B71827120D006F8EED /* particleemitter.h */,
+ 2B1217B81827120D006F8EED /* particleemitterprop.h */,
+ 2B1217B91827120D006F8EED /* rotationalparticle.cpp */,
+ 2B1217BA1827120D006F8EED /* rotationalparticle.h */,
+ 2B1217BB1827120D006F8EED /* textparticle.cpp */,
+ 2B1217BC1827120D006F8EED /* textparticle.h */,
+ );
+ name = particle;
+ path = ../../src/particle;
+ sourceTree = "<group>";
+ };
+ 2B1217BD1827120D006F8EED /* render */ = {
+ isa = PBXGroup;
+ children = (
+ 2B9A1A4A188F3D72005F72F1 /* graphics_calcImageRect.hpp */,
+ 2B9A1A4B188F3D72005F72F1 /* graphics_drawImageRect.hpp */,
+ 2B9A1A4C188F3D72005F72F1 /* openglgraphicsdef.hpp */,
+ 2B72F31E1827173C003A9FB7 /* mgl.cpp */,
+ 2B72F31F1827173C003A9FB7 /* mgl.h */,
+ 2B1217BE1827120D006F8EED /* graphics.cpp */,
+ 2B1217BF1827120D006F8EED /* graphics.h */,
+ 2B1217C01827120D006F8EED /* mobileopenglgraphics.cpp */,
+ 2B1217C11827120D006F8EED /* mobileopenglgraphics.h */,
+ 2B1217C21827120D006F8EED /* normalopenglgraphics.cpp */,
+ 2B1217C31827120D006F8EED /* normalopenglgraphics.h */,
+ 2B1217C41827120D006F8EED /* nullopenglgraphics.cpp */,
+ 2B1217C51827120D006F8EED /* nullopenglgraphics.h */,
+ 2B1217C61827120D006F8EED /* renderers.cpp */,
+ 2B1217C71827120D006F8EED /* renderers.h */,
+ 2B1217C81827120D006F8EED /* rendererslistsdl.h */,
+ 2B1217C91827120D006F8EED /* rendererslistsdl2.h */,
+ 2B1217CA1827120D006F8EED /* safeopenglgraphics.cpp */,
+ 2B1217CB1827120D006F8EED /* safeopenglgraphics.h */,
+ 2B1217CC1827120D006F8EED /* sdl2graphics.cpp */,
+ 2B1217CD1827120D006F8EED /* sdl2graphics.h */,
+ 2B1217CE1827120D006F8EED /* sdl2softwaregraphics.cpp */,
+ 2B1217CF1827120D006F8EED /* sdl2softwaregraphics.h */,
+ 2B1217D01827120D006F8EED /* sdlgraphics.cpp */,
+ 2B1217D11827120D006F8EED /* sdlgraphics.h */,
+ 2B1217D21827120D006F8EED /* surfacegraphics.cpp */,
+ 2B1217D31827120D006F8EED /* surfacegraphics.h */,
+ );
+ name = render;
+ path = ../../src/render;
+ sourceTree = "<group>";
+ };
+ 2B72F20018271656003A9FB7 /* popups */ = {
+ isa = PBXGroup;
+ children = (
+ 2B72F20118271656003A9FB7 /* beingpopup.cpp */,
+ 2B72F20218271656003A9FB7 /* beingpopup.h */,
+ 2B72F20318271656003A9FB7 /* itempopup.cpp */,
+ 2B72F20418271656003A9FB7 /* itempopup.h */,
+ 2B72F20518271656003A9FB7 /* popupmenu.cpp */,
+ 2B72F20618271656003A9FB7 /* popupmenu.h */,
+ 2B72F20718271656003A9FB7 /* speechbubble.cpp */,
+ 2B72F20818271656003A9FB7 /* speechbubble.h */,
+ 2B72F20918271656003A9FB7 /* spellpopup.cpp */,
+ 2B72F20A18271656003A9FB7 /* spellpopup.h */,
+ 2B72F20B18271656003A9FB7 /* statuspopup.cpp */,
+ 2B72F20C18271656003A9FB7 /* statuspopup.h */,
+ 2B72F20D18271656003A9FB7 /* textpopup.cpp */,
+ 2B72F20E18271656003A9FB7 /* textpopup.h */,
+ );
+ path = popups;
+ sourceTree = "<group>";
+ };
+ 2B72F20F18271656003A9FB7 /* windows */ = {
+ isa = PBXGroup;
+ children = (
+ 2B72F21018271656003A9FB7 /* botcheckerwindow.cpp */,
+ 2B72F21118271656003A9FB7 /* botcheckerwindow.h */,
+ 2B72F21218271656003A9FB7 /* buydialog.cpp */,
+ 2B72F21318271656003A9FB7 /* buydialog.h */,
+ 2B72F21418271656003A9FB7 /* buyselldialog.cpp */,
+ 2B72F21518271656003A9FB7 /* buyselldialog.h */,
+ 2B72F21618271656003A9FB7 /* changeemaildialog.cpp */,
+ 2B72F21718271656003A9FB7 /* changeemaildialog.h */,
+ 2B72F21818271656003A9FB7 /* changepassworddialog.cpp */,
+ 2B72F21918271656003A9FB7 /* changepassworddialog.h */,
+ 2B72F21A18271656003A9FB7 /* charcreatedialog.cpp */,
+ 2B72F21B18271656003A9FB7 /* charcreatedialog.h */,
+ 2B72F21C18271656003A9FB7 /* charselectdialog.cpp */,
+ 2B72F21D18271656003A9FB7 /* charselectdialog.h */,
+ 2B72F21E18271656003A9FB7 /* chatwindow.cpp */,
+ 2B72F21F18271656003A9FB7 /* chatwindow.h */,
+ 2B72F22018271656003A9FB7 /* confirmdialog.cpp */,
+ 2B72F22118271656003A9FB7 /* confirmdialog.h */,
+ 2B72F22218271656003A9FB7 /* connectiondialog.cpp */,
+ 2B72F22318271656003A9FB7 /* connectiondialog.h */,
+ 2B72F22418271656003A9FB7 /* debugwindow.cpp */,
+ 2B72F22518271656003A9FB7 /* debugwindow.h */,
+ 2B72F22618271656003A9FB7 /* didyouknowwindow.cpp */,
+ 2B72F22718271656003A9FB7 /* didyouknowwindow.h */,
+ 2B72F22818271656003A9FB7 /* editdialog.cpp */,
+ 2B72F22918271656003A9FB7 /* editdialog.h */,
+ 2B72F22A18271656003A9FB7 /* editserverdialog.cpp */,
+ 2B72F22B18271656003A9FB7 /* editserverdialog.h */,
+ 2B72F22C18271656003A9FB7 /* emotewindow.cpp */,
+ 2B72F22D18271656003A9FB7 /* emotewindow.h */,
+ 2B72F22E18271656003A9FB7 /* equipmentwindow.cpp */,
+ 2B72F22F18271656003A9FB7 /* equipmentwindow.h */,
+ 2B72F23018271656003A9FB7 /* helpwindow.cpp */,
+ 2B72F23118271656003A9FB7 /* helpwindow.h */,
+ 2B72F23218271656003A9FB7 /* inventorywindow.cpp */,
+ 2B72F23318271656003A9FB7 /* inventorywindow.h */,
+ 2B72F23418271656003A9FB7 /* itemamountwindow.cpp */,
+ 2B72F23518271656003A9FB7 /* itemamountwindow.h */,
+ 2B72F23618271656003A9FB7 /* killstats.cpp */,
+ 2B72F23718271656003A9FB7 /* killstats.h */,
+ 2B72F23818271656003A9FB7 /* logindialog.cpp */,
+ 2B72F23918271656003A9FB7 /* logindialog.h */,
+ 2B72F23A18271656003A9FB7 /* minimap.cpp */,
+ 2B72F23B18271656003A9FB7 /* minimap.h */,
+ 2B72F23C18271656003A9FB7 /* ministatuswindow.cpp */,
+ 2B72F23D18271656003A9FB7 /* ministatuswindow.h */,
+ 2B72F23E18271656003A9FB7 /* npcdialog.cpp */,
+ 2B72F23F18271656003A9FB7 /* npcdialog.h */,
+ 2B72F24018271656003A9FB7 /* npcpostdialog.cpp */,
+ 2B72F24118271656003A9FB7 /* npcpostdialog.h */,
+ 2B72F24218271656003A9FB7 /* okdialog.cpp */,
+ 2B72F24318271656003A9FB7 /* okdialog.h */,
+ 2B72F24418271656003A9FB7 /* outfitwindow.cpp */,
+ 2B72F24518271656003A9FB7 /* outfitwindow.h */,
+ 2B72F24618271656003A9FB7 /* questswindow.cpp */,
+ 2B72F24718271656003A9FB7 /* questswindow.h */,
+ 2B72F24818271656003A9FB7 /* quitdialog.cpp */,
+ 2B72F24918271656003A9FB7 /* quitdialog.h */,
+ 2B72F24A18271656003A9FB7 /* registerdialog.cpp */,
+ 2B72F24B18271656003A9FB7 /* registerdialog.h */,
+ 2B72F24C18271656003A9FB7 /* selldialog.cpp */,
+ 2B72F24D18271656003A9FB7 /* selldialog.h */,
+ 2B72F24E18271656003A9FB7 /* serverdialog.cpp */,
+ 2B72F24F18271656003A9FB7 /* serverdialog.h */,
+ 2B72F25018271656003A9FB7 /* setup.cpp */,
+ 2B72F25118271656003A9FB7 /* setup.h */,
+ 2B72F25218271656003A9FB7 /* shopwindow.cpp */,
+ 2B72F25318271656003A9FB7 /* shopwindow.h */,
+ 2B72F25418271656003A9FB7 /* shortcutwindow.cpp */,
+ 2B72F25518271656003A9FB7 /* shortcutwindow.h */,
+ 2B72F25618271656003A9FB7 /* skilldialog.cpp */,
+ 2B72F25718271656003A9FB7 /* skilldialog.h */,
+ 2B72F25818271656003A9FB7 /* socialwindow.cpp */,
+ 2B72F25918271656003A9FB7 /* socialwindow.h */,
+ 2B72F25A18271656003A9FB7 /* statuswindow.cpp */,
+ 2B72F25B18271656003A9FB7 /* statuswindow.h */,
+ 2B72F25C18271656003A9FB7 /* textcommandeditor.cpp */,
+ 2B72F25D18271656003A9FB7 /* textcommandeditor.h */,
+ 2B72F25E18271656003A9FB7 /* textdialog.cpp */,
+ 2B72F25F18271656003A9FB7 /* textdialog.h */,
+ 2B72F26018271656003A9FB7 /* tradewindow.cpp */,
+ 2B72F26118271656003A9FB7 /* tradewindow.h */,
+ 2B72F26218271656003A9FB7 /* unregisterdialog.cpp */,
+ 2B72F26318271656003A9FB7 /* unregisterdialog.h */,
+ 2B72F26418271656003A9FB7 /* updaterwindow.cpp */,
+ 2B72F26518271656003A9FB7 /* updaterwindow.h */,
+ 2B72F26618271656003A9FB7 /* whoisonline.cpp */,
+ 2B72F26718271656003A9FB7 /* whoisonline.h */,
+ 2B72F26818271656003A9FB7 /* worldselectdialog.cpp */,
+ 2B72F26918271656003A9FB7 /* worldselectdialog.h */,
+ );
+ path = windows;
+ sourceTree = "<group>";
+ };
+ 2B72F2ED18271727003A9FB7 /* db */ = {
+ isa = PBXGroup;
+ children = (
+ 2B9A1A5C188F3EE4005F72F1 /* moddb.cpp */,
+ 2B9A1A5D188F3EE4005F72F1 /* moddb.h */,
+ 2B72F2EE18271727003A9FB7 /* avatardb.cpp */,
+ 2B72F2EF18271727003A9FB7 /* avatardb.h */,
+ 2B72F2F018271727003A9FB7 /* chardb.cpp */,
+ 2B72F2F118271727003A9FB7 /* chardb.h */,
+ 2B72F2F218271727003A9FB7 /* colordb.cpp */,
+ 2B72F2F318271727003A9FB7 /* colordb.h */,
+ 2B72F2F418271727003A9FB7 /* deaddb.cpp */,
+ 2B72F2F518271727003A9FB7 /* deaddb.h */,
+ 2B72F2F618271727003A9FB7 /* emotedb.cpp */,
+ 2B72F2F718271727003A9FB7 /* emotedb.h */,
+ 2B72F2F818271727003A9FB7 /* itemdb.cpp */,
+ 2B72F2F918271727003A9FB7 /* itemdb.h */,
+ 2B72F2FA18271727003A9FB7 /* mapdb.cpp */,
+ 2B72F2FB18271727003A9FB7 /* mapdb.h */,
+ 2B72F2FC18271727003A9FB7 /* monsterdb.cpp */,
+ 2B72F2FD18271727003A9FB7 /* monsterdb.h */,
+ 2B72F2FE18271727003A9FB7 /* npcdb.cpp */,
+ 2B72F2FF18271727003A9FB7 /* npcdb.h */,
+ 2B72F30018271727003A9FB7 /* palettedb.cpp */,
+ 2B72F30118271727003A9FB7 /* palettedb.h */,
+ 2B72F30218271727003A9FB7 /* petdb.cpp */,
+ 2B72F30318271727003A9FB7 /* petdb.h */,
+ 2B72F30418271727003A9FB7 /* sounddb.cpp */,
+ 2B72F30518271727003A9FB7 /* sounddb.h */,
+ );
+ path = db;
+ sourceTree = "<group>";
+ };
+ 2B72F3221827175B003A9FB7 /* tabs */ = {
+ isa = PBXGroup;
+ children = (
+ 2B9A1A46188F3D40005F72F1 /* setup_mods.cpp */,
+ 2B9A1A47188F3D40005F72F1 /* setup_mods.h */,
+ 2B72F3231827175B003A9FB7 /* battletab.cpp */,
+ 2B72F3241827175B003A9FB7 /* battletab.h */,
+ 2B72F3251827175B003A9FB7 /* chattab.cpp */,
+ 2B72F3261827175B003A9FB7 /* chattab.h */,
+ 2B72F3271827175B003A9FB7 /* gmtab.cpp */,
+ 2B72F3281827175B003A9FB7 /* gmtab.h */,
+ 2B72F3291827175B003A9FB7 /* guildchattab.cpp */,
+ 2B72F32A1827175B003A9FB7 /* guildchattab.h */,
+ 2B72F32B1827175B003A9FB7 /* langtab.cpp */,
+ 2B72F32C1827175B003A9FB7 /* langtab.h */,
+ 2B72F32D1827175B003A9FB7 /* setup_audio.cpp */,
+ 2B72F32E1827175B003A9FB7 /* setup_audio.h */,
+ 2B72F32F1827175B003A9FB7 /* setup_chat.cpp */,
+ 2B72F3301827175B003A9FB7 /* setup_chat.h */,
+ 2B72F3311827175B003A9FB7 /* setup_colors.cpp */,
+ 2B72F3321827175B003A9FB7 /* setup_colors.h */,
+ 2B72F3331827175B003A9FB7 /* setup_input.cpp */,
+ 2B72F3341827175B003A9FB7 /* setup_input.h */,
+ 2B72F3351827175B003A9FB7 /* setup_joystick.cpp */,
+ 2B72F3361827175B003A9FB7 /* setup_joystick.h */,
+ 2B72F3371827175B003A9FB7 /* setup_other.cpp */,
+ 2B72F3381827175B003A9FB7 /* setup_other.h */,
+ 2B72F3391827175B003A9FB7 /* setup_perfomance.cpp */,
+ 2B72F33A1827175B003A9FB7 /* setup_perfomance.h */,
+ 2B72F33B1827175B003A9FB7 /* setup_players.cpp */,
+ 2B72F33C1827175B003A9FB7 /* setup_players.h */,
+ 2B72F33D1827175B003A9FB7 /* setup_relations.cpp */,
+ 2B72F33E1827175B003A9FB7 /* setup_relations.h */,
+ 2B72F33F1827175B003A9FB7 /* setup_theme.cpp */,
+ 2B72F3401827175B003A9FB7 /* setup_theme.h */,
+ 2B72F3411827175B003A9FB7 /* setup_touch.cpp */,
+ 2B72F3421827175B003A9FB7 /* setup_touch.h */,
+ 2B72F3431827175B003A9FB7 /* setup_video.cpp */,
+ 2B72F3441827175B003A9FB7 /* setup_video.h */,
+ 2B72F3451827175B003A9FB7 /* setup_visual.cpp */,
+ 2B72F3461827175B003A9FB7 /* setup_visual.h */,
+ 2B72F3471827175B003A9FB7 /* setuptab.cpp */,
+ 2B72F3481827175B003A9FB7 /* setuptab.h */,
+ 2B72F3491827175B003A9FB7 /* setuptabscroll.cpp */,
+ 2B72F34A1827175B003A9FB7 /* setuptabscroll.h */,
+ 2B72F34B1827175B003A9FB7 /* tab.cpp */,
+ 2B72F34C1827175B003A9FB7 /* tab.h */,
+ 2B72F34D1827175B003A9FB7 /* tradetab.cpp */,
+ 2B72F34E1827175B003A9FB7 /* tradetab.h */,
+ 2B72F34F1827175B003A9FB7 /* whispertab.cpp */,
+ 2B72F3501827175B003A9FB7 /* whispertab.h */,
+ );
+ path = tabs;
+ sourceTree = "<group>";
+ };
2BDF45B4166D5AEC0054E77F = {
isa = PBXGroup;
children = (
@@ -2155,44 +2486,23 @@
2BDF45C9166D5AEC0054E77F /* ManaPlus */ = {
isa = PBXGroup;
children = (
- 2B6B0E68176BDE0400930985 /* beingcacheentry.h */,
- 2B6B0E69176BDE0400930985 /* beingequipbackend.cpp */,
- 2B6B0E6A176BDE0400930985 /* beingequipbackend.h */,
- 2B6B0E64176BDDE100930985 /* depricatedlistener.cpp */,
- 2B6B0E65176BDDE100930985 /* depricatedlistener.h */,
- 2B6B0E53176BDD5500930985 /* dragdrop.h */,
- 2BB28FB4172B4CEF0046599B /* nullopenglgraphics.cpp */,
- 2BB28FB5172B4CEF0046599B /* nullopenglgraphics.h */,
- 2B1E2220172AFA2100B7230A /* navigationmanager.cpp */,
- 2B1E2221172AFA2100B7230A /* navigationmanager.h */,
- 2B1E2214172AF96000B7230A /* auctionmanager.cpp */,
- 2B1E2215172AF96000B7230A /* auctionmanager.h */,
- 2B1E2216172AF96000B7230A /* walklayer.cpp */,
- 2B1E2217172AF96000B7230A /* walklayer.h */,
- 2B65B45416EFC75D00AAD717 /* notifications.h */,
- 2B65B45516EFC75D00AAD717 /* notifymanager.cpp */,
- 2B65B45616EFC75D00AAD717 /* notifymanager.h */,
2BDF4755166D5B680054E77F /* actionmanager.cpp */,
2BDF4756166D5B680054E77F /* actionmanager.h */,
- 2BDF4757166D5B680054E77F /* actor.cpp */,
- 2BDF4758166D5B680054E77F /* actor.h */,
- 2BDF4759166D5B680054E77F /* actorsprite.cpp */,
- 2BDF475A166D5B680054E77F /* actorsprite.h */,
- 2BDF475B166D5B680054E77F /* actorspritelistener.h */,
- 2BDF475C166D5B680054E77F /* actorspritemanager.cpp */,
- 2BDF475D166D5B680054E77F /* actorspritemanager.h */,
+ 2B72F2D2182716C1003A9FB7 /* actormanager.cpp */,
+ 2B72F2D5182716C1003A9FB7 /* actormanager.h */,
2BDF475E166D5B680054E77F /* animatedsprite.cpp */,
2BDF475F166D5B680054E77F /* animatedsprite.h */,
2BDF4760166D5B680054E77F /* animationdelayload.cpp */,
2BDF4761166D5B680054E77F /* animationdelayload.h */,
- 2BDF4762166D5B680054E77F /* animationparticle.cpp */,
- 2BDF4763166D5B680054E77F /* animationparticle.h */,
2BDF45D5166D5AEC0054E77F /* AppDelegate.h */,
2BDF45D6166D5AEC0054E77F /* AppDelegate.m */,
+ 2B1E2214172AF96000B7230A /* auctionmanager.cpp */,
+ 2B1E2215172AF96000B7230A /* auctionmanager.h */,
2BDF4766166D5B680054E77F /* avatar.cpp */,
2BDF4767166D5B680054E77F /* avatar.h */,
- 2BDF4768166D5B680054E77F /* being.cpp */,
- 2BDF4769166D5B680054E77F /* being.h */,
+ 2B12178D1827120D006F8EED /* being */,
+ 2B6B0E69176BDE0400930985 /* beingequipbackend.cpp */,
+ 2B6B0E6A176BDE0400930985 /* beingequipbackend.h */,
2BDF476E166D5B680054E77F /* chatlogger.cpp */,
2BDF476F166D5B680054E77F /* chatlogger.h */,
2BDF4770166D5B680054E77F /* client.cpp */,
@@ -2201,8 +2511,6 @@
2BDF4773166D5B680054E77F /* commandhandler.h */,
2BDF4774166D5B680054E77F /* commands.cpp */,
2BDF4775166D5B680054E77F /* commands.h */,
- 2BDF4776166D5B680054E77F /* compoundsprite.cpp */,
- 2BDF4777166D5B680054E77F /* compoundsprite.h */,
2BDF4778166D5B680054E77F /* configlistener.h */,
2BDF4779166D5B680054E77F /* configuration.cpp */,
2BDF477A166D5B680054E77F /* configuration.h */,
@@ -2213,6 +2521,9 @@
2BDF4782166D5B680054E77F /* defaults.h */,
2BDF4783166D5B680054E77F /* depricatedevent.cpp */,
2BDF4784166D5B680054E77F /* depricatedevent.h */,
+ 2B6B0E64176BDDE100930985 /* depricatedlistener.cpp */,
+ 2B6B0E65176BDDE100930985 /* depricatedlistener.h */,
+ 2B6B0E53176BDD5500930985 /* dragdrop.h */,
2BDF4785166D5B680054E77F /* dropshortcut.cpp */,
2BDF4786166D5B680054E77F /* dropshortcut.h */,
2BDF4787166D5B680054E77F /* effectmanager.cpp */,
@@ -2220,12 +2531,12 @@
2BDF4789166D5B680054E77F /* emoteshortcut.cpp */,
2BDF478A166D5B680054E77F /* emoteshortcut.h */,
2BDF478B166D5B680054E77F /* equipment.h */,
+ 2B72F2D3182716C1003A9FB7 /* eventsmanager.cpp */,
+ 2B72F2D4182716C1003A9FB7 /* eventsmanager.h */,
2BDF478E166D5B680054E77F /* flooritem.cpp */,
2BDF478F166D5B680054E77F /* flooritem.h */,
2BDF4790166D5B680054E77F /* game.cpp */,
2BDF4791166D5B680054E77F /* game.h */,
- 2BDF4792166D5B680054E77F /* graphics.cpp */,
- 2BDF4793166D5B680054E77F /* graphics.h */,
2BDF4794166D5B680054E77F /* graphicsmanager.cpp */,
2BDF4795166D5B680054E77F /* graphicsmanager.h */,
2BDF4796166D5B680054E77F /* graphicsvertexes.cpp */,
@@ -2236,33 +2547,18 @@
2BDF48FB166D5B680054E77F /* guild.h */,
2BDF48FC166D5B680054E77F /* guildmanager.cpp */,
2BDF48FD166D5B680054E77F /* guildmanager.h */,
- 2BDF48FE166D5B680054E77F /* imageparticle.cpp */,
- 2BDF48FF166D5B680054E77F /* imageparticle.h */,
2BDF4900166D5B680054E77F /* imagesprite.cpp */,
2BDF4901166D5B680054E77F /* imagesprite.h */,
- 2BDF4902166D5B680054E77F /* inputevent.cpp */,
- 2BDF4903166D5B680054E77F /* inputevent.h */,
- 2BDF4904166D5B680054E77F /* inputmanager.cpp */,
- 2BDF4905166D5B680054E77F /* inputmanager.h */,
+ 2B12179E1827120D006F8EED /* input */,
2BDF4906166D5B680054E77F /* inventory.cpp */,
2BDF4907166D5B680054E77F /* inventory.h */,
2BDF4908166D5B680054E77F /* item.cpp */,
2BDF4909166D5B680054E77F /* item.h */,
2BDF490A166D5B680054E77F /* itemshortcut.cpp */,
2BDF490B166D5B680054E77F /* itemshortcut.h */,
- 2BDF490C166D5B680054E77F /* joystick.cpp */,
- 2BDF490D166D5B680054E77F /* joystick.h */,
- 2BDF490E166D5B680054E77F /* keyboardconfig.cpp */,
- 2BDF490F166D5B680054E77F /* keyboardconfig.h */,
- 2BDF4910166D5B680054E77F /* keyboarddata.h */,
- 2BDF4911166D5B680054E77F /* keydata.h */,
- 2BDF4912166D5B680054E77F /* keyevent.cpp */,
- 2BDF4913166D5B680054E77F /* keyevent.h */,
- 2BDF4914166D5B680054E77F /* keyinput.cpp */,
- 2BDF4915166D5B680054E77F /* keyinput.h */,
+ 2B72F2D6182716C1003A9FB7 /* itemsoundmanager.cpp */,
+ 2B72F2D7182716C1003A9FB7 /* itemsoundmanager.h */,
2BDF4918166D5B680054E77F /* localconsts.h */,
- 2BDF4919166D5B680054E77F /* localplayer.cpp */,
- 2BDF491A166D5B680054E77F /* localplayer.h */,
2BDF491B166D5B680054E77F /* logger.cpp */,
2BDF491C166D5B680054E77F /* logger.h */,
2BDF491D166D5B680054E77F /* main.cpp */,
@@ -2270,46 +2566,36 @@
2BDF45D8166D5AEC0054E77F /* MainMenu.xib */,
2BDF491F166D5B680054E77F /* map.cpp */,
2BDF4920166D5B680054E77F /* map.h */,
+ 2B121789182711F8006F8EED /* mapheights.cpp */,
+ 2B12178A182711F8006F8EED /* mapheights.h */,
2BDF4921166D5B680054E77F /* maplayer.cpp */,
2BDF4922166D5B680054E77F /* maplayer.h */,
- 2BDF4923166D5B680054E77F /* mgl.cpp */,
- 2BDF4924166D5B680054E77F /* mgl.h */,
- 2BDF4925166D5B680054E77F /* mobileopenglgraphics.cpp */,
- 2BDF4926166D5B680054E77F /* mobileopenglgraphics.h */,
2BDF4927166D5B680054E77F /* mouseinput.cpp */,
2BDF4928166D5B680054E77F /* mouseinput.h */,
2BDF4929166D5B680054E77F /* mumblemanager.cpp */,
2BDF492A166D5B680054E77F /* mumblemanager.h */,
+ 2B1E2220172AFA2100B7230A /* navigationmanager.cpp */,
+ 2B1E2221172AFA2100B7230A /* navigationmanager.h */,
2BDF492B166D5B680054E77F /* net */,
- 2BDF49D2166D5B680054E77F /* normalopenglgraphics.cpp */,
- 2BDF49D3166D5B680054E77F /* normalopenglgraphics.h */,
- 2BDF49D4166D5B680054E77F /* particle.cpp */,
- 2BDF49D5166D5B680054E77F /* particle.h */,
- 2BDF49D6166D5B680054E77F /* particlecontainer.cpp */,
- 2BDF49D7166D5B680054E77F /* particlecontainer.h */,
- 2BDF49D8166D5B680054E77F /* particleemitter.cpp */,
- 2BDF49D9166D5B680054E77F /* particleemitter.h */,
- 2BDF49DA166D5B680054E77F /* particleemitterprop.h */,
+ 2B65B45416EFC75D00AAD717 /* notifications.h */,
+ 2B65B45516EFC75D00AAD717 /* notifymanager.cpp */,
+ 2B65B45616EFC75D00AAD717 /* notifymanager.h */,
+ 2B1217AD1827120D006F8EED /* particle */,
2BDF49DB166D5B680054E77F /* party.cpp */,
2BDF49DC166D5B680054E77F /* party.h */,
- 2BDF49DD166D5B680054E77F /* playerinfo.cpp */,
- 2BDF49DE166D5B680054E77F /* playerinfo.h */,
- 2BDF49DF166D5B680054E77F /* playerrelations.cpp */,
- 2BDF49E0166D5B680054E77F /* playerrelations.h */,
2BDF49E1166D5B680054E77F /* position.cpp */,
2BDF49E2166D5B680054E77F /* position.h */,
2BDF49E3166D5B680054E77F /* properties.h */,
+ 2B1217BD1827120D006F8EED /* render */,
2BDF49E4166D5B680054E77F /* resources */,
- 2BDF4A22166D5B680054E77F /* rotationalparticle.cpp */,
- 2BDF4A23166D5B680054E77F /* rotationalparticle.h */,
- 2BDF4A24166D5B680054E77F /* safeopenglgraphics.cpp */,
- 2BDF4A25166D5B680054E77F /* safeopenglgraphics.h */,
2BDF4A26166D5B680054E77F /* SDLMain.h */,
2BDF4A27166D5B680054E77F /* SDLMain.m */,
+ 2B72F2D8182716C1003A9FB7 /* sdlshared.h */,
2BDF4A28166D5B680054E77F /* shopitem.cpp */,
2BDF4A29166D5B680054E77F /* shopitem.h */,
2BDF4A2A166D5B680054E77F /* simpleanimation.cpp */,
2BDF4A2B166D5B680054E77F /* simpleanimation.h */,
+ 2B72F2D9182716C1003A9FB7 /* soundconsts.h */,
2BDF4A2C166D5B680054E77F /* soundmanager.cpp */,
2BDF4A2D166D5B680054E77F /* soundmanager.h */,
2BDF4A2E166D5B680054E77F /* spellmanager.cpp */,
@@ -2327,8 +2613,6 @@
2BDF4A3D166D5B680054E77F /* textcommand.h */,
2BDF4A3E166D5B680054E77F /* textmanager.cpp */,
2BDF4A3F166D5B680054E77F /* textmanager.h */,
- 2BDF4A40166D5B680054E77F /* textparticle.cpp */,
- 2BDF4A41166D5B680054E77F /* textparticle.h */,
2BDF4A43166D5B680054E77F /* tileset.h */,
2BDF4A44166D5B680054E77F /* touchactions.cpp */,
2BDF4A45166D5B680054E77F /* touchactions.h */,
@@ -2340,6 +2624,8 @@
2BDF4A72166D5B680054E77F /* variabledata.h */,
2BDF4A73166D5B680054E77F /* vector.cpp */,
2BDF4A74166D5B680054E77F /* vector.h */,
+ 2B1E2216172AF96000B7230A /* walklayer.cpp */,
+ 2B1E2217172AF96000B7230A /* walklayer.h */,
2BDF4A75166D5B680054E77F /* winver.h */,
);
path = ManaPlus;
@@ -2390,154 +2676,28 @@
2BDF4798166D5B680054E77F /* gui */ = {
isa = PBXGroup;
children = (
- 2B8B70CC167EBE3A003A8440 /* setup_touch.cpp */,
- 2B8B70CD167EBE3A003A8440 /* setup_touch.h */,
- 2BDF4799166D5B680054E77F /* beingpopup.cpp */,
- 2BDF479A166D5B680054E77F /* beingpopup.h */,
- 2BDF479B166D5B680054E77F /* botcheckerwindow.cpp */,
- 2BDF479C166D5B680054E77F /* botcheckerwindow.h */,
- 2BDF479D166D5B680054E77F /* buydialog.cpp */,
- 2BDF479E166D5B680054E77F /* buydialog.h */,
- 2BDF479F166D5B680054E77F /* buyselldialog.cpp */,
- 2BDF47A0166D5B680054E77F /* buyselldialog.h */,
- 2BDF47A1166D5B680054E77F /* changeemaildialog.cpp */,
- 2BDF47A2166D5B680054E77F /* changeemaildialog.h */,
- 2BDF47A3166D5B680054E77F /* changepassworddialog.cpp */,
- 2BDF47A4166D5B680054E77F /* changepassworddialog.h */,
- 2BDF47A5166D5B680054E77F /* charcreatedialog.cpp */,
- 2BDF47A6166D5B680054E77F /* charcreatedialog.h */,
- 2BDF47A7166D5B680054E77F /* charselectdialog.cpp */,
- 2BDF47A8166D5B680054E77F /* charselectdialog.h */,
- 2BDF47A9166D5B680054E77F /* chatwindow.cpp */,
- 2BDF47AA166D5B680054E77F /* chatwindow.h */,
- 2BDF47AB166D5B680054E77F /* confirmdialog.cpp */,
- 2BDF47AC166D5B680054E77F /* confirmdialog.h */,
- 2BDF47AD166D5B680054E77F /* connectiondialog.cpp */,
- 2BDF47AE166D5B680054E77F /* connectiondialog.h */,
- 2BDF47AF166D5B680054E77F /* debugwindow.cpp */,
- 2BDF47B0166D5B680054E77F /* debugwindow.h */,
- 2BDF47B1166D5B680054E77F /* didyouknowwindow.cpp */,
- 2BDF47B2166D5B680054E77F /* didyouknowwindow.h */,
- 2BDF47B3166D5B680054E77F /* editdialog.cpp */,
- 2BDF47B4166D5B680054E77F /* editdialog.h */,
- 2BDF47B5166D5B680054E77F /* editserverdialog.cpp */,
- 2BDF47B6166D5B680054E77F /* editserverdialog.h */,
- 2BDF47B7166D5B680054E77F /* equipmentwindow.cpp */,
- 2BDF47B8166D5B680054E77F /* equipmentwindow.h */,
+ 2B72F20018271656003A9FB7 /* popups */,
+ 2B72F20F18271656003A9FB7 /* windows */,
2BDF47B9166D5B680054E77F /* focushandler.cpp */,
2BDF47BA166D5B680054E77F /* focushandler.h */,
2BDF47BB166D5B680054E77F /* gui.cpp */,
2BDF47BC166D5B680054E77F /* gui.h */,
- 2BDF47BD166D5B680054E77F /* helpwindow.cpp */,
- 2BDF47BE166D5B680054E77F /* helpwindow.h */,
- 2BDF47BF166D5B680054E77F /* inventorywindow.cpp */,
- 2BDF47C0166D5B680054E77F /* inventorywindow.h */,
- 2BDF47C1166D5B680054E77F /* itemamountwindow.cpp */,
- 2BDF47C2166D5B680054E77F /* itemamountwindow.h */,
- 2BDF47C3166D5B680054E77F /* itempopup.cpp */,
- 2BDF47C4166D5B680054E77F /* itempopup.h */,
- 2BDF47C5166D5B680054E77F /* killstats.cpp */,
- 2BDF47C6166D5B680054E77F /* killstats.h */,
- 2BDF47C7166D5B680054E77F /* logindialog.cpp */,
- 2BDF47C8166D5B680054E77F /* logindialog.h */,
- 2BDF47C9166D5B680054E77F /* minimap.cpp */,
- 2BDF47CA166D5B680054E77F /* minimap.h */,
- 2BDF47CB166D5B680054E77F /* ministatuswindow.cpp */,
- 2BDF47CC166D5B680054E77F /* ministatuswindow.h */,
- 2BDF47CD166D5B680054E77F /* npcdialog.cpp */,
- 2BDF47CE166D5B680054E77F /* npcdialog.h */,
- 2BDF47CF166D5B680054E77F /* npcpostdialog.cpp */,
- 2BDF47D0166D5B680054E77F /* npcpostdialog.h */,
- 2BDF47D1166D5B680054E77F /* okdialog.cpp */,
- 2BDF47D2166D5B680054E77F /* okdialog.h */,
- 2BDF47D3166D5B680054E77F /* outfitwindow.cpp */,
- 2BDF47D4166D5B680054E77F /* outfitwindow.h */,
2BDF47D5166D5B680054E77F /* palette.cpp */,
2BDF47D6166D5B680054E77F /* palette.h */,
- 2BDF47D7166D5B680054E77F /* popupmenu.cpp */,
- 2BDF47D8166D5B680054E77F /* popupmenu.h */,
- 2BDF47D9166D5B680054E77F /* questswindow.cpp */,
- 2BDF47DA166D5B680054E77F /* questswindow.h */,
- 2BDF47DB166D5B680054E77F /* quitdialog.cpp */,
- 2BDF47DC166D5B680054E77F /* quitdialog.h */,
- 2BDF47DD166D5B680054E77F /* registerdialog.cpp */,
- 2BDF47DE166D5B680054E77F /* registerdialog.h */,
2BDF47DF166D5B680054E77F /* sdlfont.cpp */,
2BDF47E0166D5B680054E77F /* sdlfont.h */,
2BDF47E1166D5B680054E77F /* sdlinput.cpp */,
2BDF47E2166D5B680054E77F /* sdlinput.h */,
- 2BDF47E3166D5B680054E77F /* selldialog.cpp */,
- 2BDF47E4166D5B680054E77F /* selldialog.h */,
- 2BDF47E5166D5B680054E77F /* serverdialog.cpp */,
- 2BDF47E6166D5B680054E77F /* serverdialog.h */,
- 2BDF47E7166D5B680054E77F /* setup.cpp */,
- 2BDF47E8166D5B680054E77F /* setup.h */,
- 2BDF47E9166D5B680054E77F /* setup_audio.cpp */,
- 2BDF47EA166D5B680054E77F /* setup_audio.h */,
- 2BDF47EB166D5B680054E77F /* setup_chat.cpp */,
- 2BDF47EC166D5B680054E77F /* setup_chat.h */,
- 2BDF47ED166D5B680054E77F /* setup_colors.cpp */,
- 2BDF47EE166D5B680054E77F /* setup_colors.h */,
- 2BDF47EF166D5B680054E77F /* setup_input.cpp */,
- 2BDF47F0166D5B680054E77F /* setup_input.h */,
- 2BDF47F1166D5B680054E77F /* setup_joystick.cpp */,
- 2BDF47F2166D5B680054E77F /* setup_joystick.h */,
- 2BDF47F3166D5B680054E77F /* setup_other.cpp */,
- 2BDF47F4166D5B680054E77F /* setup_other.h */,
- 2BDF47F5166D5B680054E77F /* setup_perfomance.cpp */,
- 2BDF47F6166D5B680054E77F /* setup_perfomance.h */,
- 2BDF47F7166D5B680054E77F /* setup_players.cpp */,
- 2BDF47F8166D5B680054E77F /* setup_players.h */,
- 2BDF47F9166D5B680054E77F /* setup_relations.cpp */,
- 2BDF47FA166D5B680054E77F /* setup_relations.h */,
- 2BDF47FB166D5B680054E77F /* setup_theme.cpp */,
- 2BDF47FC166D5B680054E77F /* setup_theme.h */,
- 2BDF47FD166D5B680054E77F /* setup_video.cpp */,
- 2BDF47FE166D5B680054E77F /* setup_video.h */,
- 2BDF47FF166D5B680054E77F /* setup_visual.cpp */,
- 2BDF4800166D5B680054E77F /* setup_visual.h */,
2BDF4801166D5B680054E77F /* setupactiondata.h */,
- 2BDF4802166D5B680054E77F /* shopwindow.cpp */,
- 2BDF4803166D5B680054E77F /* shopwindow.h */,
- 2BDF4804166D5B680054E77F /* shortcutwindow.cpp */,
- 2BDF4805166D5B680054E77F /* shortcutwindow.h */,
- 2BDF4806166D5B680054E77F /* skilldialog.cpp */,
- 2BDF4807166D5B680054E77F /* skilldialog.h */,
- 2BDF4808166D5B680054E77F /* socialwindow.cpp */,
- 2BDF4809166D5B680054E77F /* socialwindow.h */,
- 2BDF480C166D5B680054E77F /* speechbubble.cpp */,
- 2BDF480D166D5B680054E77F /* speechbubble.h */,
- 2BDF480E166D5B680054E77F /* spellpopup.cpp */,
- 2BDF480F166D5B680054E77F /* spellpopup.h */,
- 2BDF4810166D5B680054E77F /* statuspopup.cpp */,
- 2BDF4811166D5B680054E77F /* statuspopup.h */,
- 2BDF4812166D5B680054E77F /* statuswindow.cpp */,
- 2BDF4813166D5B680054E77F /* statuswindow.h */,
- 2BDF4814166D5B680054E77F /* textcommandeditor.cpp */,
- 2BDF4815166D5B680054E77F /* textcommandeditor.h */,
- 2BDF4816166D5B680054E77F /* textdialog.cpp */,
- 2BDF4817166D5B680054E77F /* textdialog.h */,
- 2BDF4818166D5B680054E77F /* textpopup.cpp */,
- 2BDF4819166D5B680054E77F /* textpopup.h */,
2BDF481A166D5B680054E77F /* theme.cpp */,
2BDF481B166D5B680054E77F /* theme.h */,
- 2BDF481C166D5B680054E77F /* tradewindow.cpp */,
- 2BDF481D166D5B680054E77F /* tradewindow.h */,
- 2BDF481E166D5B680054E77F /* unregisterdialog.cpp */,
- 2BDF481F166D5B680054E77F /* unregisterdialog.h */,
- 2BDF4820166D5B680054E77F /* updaterwindow.cpp */,
- 2BDF4821166D5B680054E77F /* updaterwindow.h */,
2BDF4822166D5B680054E77F /* userpalette.cpp */,
2BDF4823166D5B680054E77F /* userpalette.h */,
2BDF4824166D5B680054E77F /* viewport.cpp */,
2BDF4825166D5B680054E77F /* viewport.h */,
- 2BDF4826166D5B680054E77F /* whoisonline.cpp */,
- 2BDF4827166D5B680054E77F /* whoisonline.h */,
2BDF4828166D5B680054E77F /* widgets */,
2BDF48A2166D5B680054E77F /* windowmenu.cpp */,
2BDF48A3166D5B680054E77F /* windowmenu.h */,
- 2BDF48A4166D5B680054E77F /* worldselectdialog.cpp */,
- 2BDF48A5166D5B680054E77F /* worldselectdialog.h */,
);
name = gui;
path = ../../src/gui;
@@ -2546,6 +2706,13 @@
2BDF4828166D5B680054E77F /* widgets */ = {
isa = PBXGroup;
children = (
+ 2B72F3221827175B003A9FB7 /* tabs */,
+ 2B1218411827137F006F8EED /* colormodel.h */,
+ 2B1218421827137F006F8EED /* colorpage.cpp */,
+ 2B1218431827137F006F8EED /* colorpage.h */,
+ 2B1218441827137F006F8EED /* emotepage.cpp */,
+ 2B1218451827137F006F8EED /* emotepage.h */,
+ 2B1218461827137F006F8EED /* colormodel.cpp */,
2B6B0E6D176BDE2A00930985 /* characterdisplay.cpp */,
2B6B0E6E176BDE2A00930985 /* characterdisplay.h */,
2B6B0E6F176BDE2A00930985 /* characterviewbase.h */,
@@ -2559,25 +2726,17 @@
2B6B0E5B176BDDC100930985 /* skillinfo.h */,
2B6B0E5C176BDDC100930985 /* skillmodel.cpp */,
2B6B0E5D176BDDC100930985 /* skillmodel.h */,
- 2B1E221C172AF9E800B7230A /* langtab.cpp */,
- 2B1E221D172AF9E800B7230A /* langtab.h */,
- 2B7A5E5F16D82C010020A1C1 /* gmtab.cpp */,
- 2B7A5E6016D82C010020A1C1 /* gmtab.h */,
2B43647816AB8BE40034DAC2 /* setuptouchitem.cpp */,
2B43647916AB8BE40034DAC2 /* setuptouchitem.h */,
2B8B70C9167EBCB3003A8440 /* popuplist.cpp */,
2B8B70CA167EBCB3003A8440 /* popuplist.h */,
2BDF4829166D5B680054E77F /* avatarlistbox.cpp */,
2BDF482A166D5B680054E77F /* avatarlistbox.h */,
- 2BDF482B166D5B680054E77F /* battletab.cpp */,
- 2BDF482C166D5B680054E77F /* battletab.h */,
2BDF482D166D5B680054E77F /* browserbox.cpp */,
2BDF482E166D5B680054E77F /* browserbox.h */,
2BDF482F166D5B680054E77F /* browserbox_unittest.cc */,
2BDF4830166D5B680054E77F /* button.cpp */,
2BDF4831166D5B680054E77F /* button.h */,
- 2BDF4834166D5B680054E77F /* chattab.cpp */,
- 2BDF4835166D5B680054E77F /* chattab.h */,
2BDF4836166D5B680054E77F /* checkbox.cpp */,
2BDF4837166D5B680054E77F /* checkbox.h */,
2BDF4838166D5B680054E77F /* container.cpp */,
@@ -2597,8 +2756,6 @@
2BDF4846166D5B680054E77F /* extendednamesmodel.h */,
2BDF4847166D5B680054E77F /* flowcontainer.cpp */,
2BDF4848166D5B680054E77F /* flowcontainer.h */,
- 2BDF4849166D5B680054E77F /* guildchattab.cpp */,
- 2BDF484A166D5B680054E77F /* guildchattab.h */,
2BDF484B166D5B680054E77F /* guitable.cpp */,
2BDF484C166D5B680054E77F /* guitable.h */,
2BDF484D166D5B680054E77F /* horizontcontainer.cpp */,
@@ -2643,10 +2800,6 @@
2BDF4874166D5B680054E77F /* scrollarea.h */,
2BDF4875166D5B680054E77F /* setupitem.cpp */,
2BDF4876166D5B680054E77F /* setupitem.h */,
- 2BDF4877166D5B680054E77F /* setuptab.cpp */,
- 2BDF4878166D5B680054E77F /* setuptab.h */,
- 2BDF4879166D5B680054E77F /* setuptabscroll.cpp */,
- 2BDF487A166D5B680054E77F /* setuptabscroll.h */,
2BDF487B166D5B680054E77F /* shopitems.cpp */,
2BDF487C166D5B680054E77F /* shopitems.h */,
2BDF487D166D5B680054E77F /* shoplistbox.cpp */,
@@ -2659,8 +2812,6 @@
2BDF4884166D5B680054E77F /* sliderlist.h */,
2BDF4885166D5B680054E77F /* spellshortcutcontainer.cpp */,
2BDF4886166D5B680054E77F /* spellshortcutcontainer.h */,
- 2BDF4887166D5B680054E77F /* tab.cpp */,
- 2BDF4888166D5B680054E77F /* tab.h */,
2BDF4889166D5B680054E77F /* tabbedarea.cpp */,
2BDF488A166D5B680054E77F /* tabbedarea.h */,
2BDF488B166D5B680054E77F /* tablemodel.cpp */,
@@ -2673,12 +2824,8 @@
2BDF4892166D5B680054E77F /* textfield.h */,
2BDF4893166D5B680054E77F /* textpreview.cpp */,
2BDF4894166D5B680054E77F /* textpreview.h */,
- 2BDF4895166D5B680054E77F /* tradetab.cpp */,
- 2BDF4896166D5B680054E77F /* tradetab.h */,
2BDF4897166D5B680054E77F /* vertcontainer.cpp */,
2BDF4898166D5B680054E77F /* vertcontainer.h */,
- 2BDF4899166D5B680054E77F /* whispertab.cpp */,
- 2BDF489A166D5B680054E77F /* whispertab.h */,
2BDF489B166D5B680054E77F /* widget2.h */,
2BDF489C166D5B680054E77F /* widgetgroup.cpp */,
2BDF489D166D5B680054E77F /* widgetgroup.h */,
@@ -2799,7 +2946,6 @@
2BDF48E9166D5B680054E77F /* sdl */ = {
isa = PBXGroup;
children = (
- 2BDF48EA166D5B680054E77F /* sdlgraphics.cpp */,
);
path = sdl;
sourceTree = "<group>";
@@ -2810,7 +2956,6 @@
2BDF48EE166D5B680054E77F /* button.cpp */,
2BDF48EF166D5B680054E77F /* checkbox.cpp */,
2BDF48F0166D5B680054E77F /* container.cpp */,
- 2BDF48F1166D5B680054E77F /* dropdown.cpp */,
2BDF48F2166D5B680054E77F /* label.cpp */,
2BDF48F3166D5B680054E77F /* listbox.cpp */,
2BDF48F4166D5B680054E77F /* radiobutton.cpp */,
@@ -2826,6 +2971,8 @@
2BDF492B166D5B680054E77F /* net */ = {
isa = PBXGroup;
children = (
+ 2B9A1A4D188F3D9F005F72F1 /* netconsts.h */,
+ 2B9A1A4E188F3D9F005F72F1 /* pethandler.h */,
2B1E2228172AFC4C00B7230A /* charserverhandler.cpp */,
2B1E2229172AFC4C00B7230A /* charserverhandler.h */,
2B1E222A172AFC4C00B7230A /* sdltcpnet.cpp */,
@@ -2982,6 +3129,8 @@
2BDF499F166D5B680054E77F /* tmwa */ = {
isa = PBXGroup;
children = (
+ 2B9A1A4F188F3DAD005F72F1 /* pethandler.cpp */,
+ 2B9A1A50188F3DAD005F72F1 /* pethandler.h */,
2BFB6E3716E2AEB9007EE3A6 /* skillhandler.cpp */,
2BFB6E3816E2AEB9007EE3A6 /* skillhandler.h */,
2BDF49A0166D5B680054E77F /* adminhandler.cpp */,
@@ -3044,15 +3193,19 @@
2BDF49E4166D5B680054E77F /* resources */ = {
isa = PBXGroup;
children = (
+ 2B9A1A58188F3EC6005F72F1 /* modinfo.cpp */,
+ 2B9A1A59188F3EC6005F72F1 /* modinfo.h */,
+ 2B72F2ED18271727003A9FB7 /* db */,
+ 2B12182A182712DC006F8EED /* sdl2imagehelper.h */,
+ 2B12182B182712DC006F8EED /* sdl2softwareimagehelper.h */,
+ 2B12182C182712DC006F8EED /* surfaceimagehelper.h */,
+ 2B12182D182712DC006F8EED /* beingcommon.cpp */,
+ 2B12182E182712DC006F8EED /* beingcommon.h */,
+ 2B12182F182712DC006F8EED /* sdl2imagehelper.cpp */,
+ 2B121830182712DC006F8EED /* sdl2softwareimagehelper.cpp */,
+ 2B121831182712DC006F8EED /* surfaceimagehelper.cpp */,
+ 2B121832182712DC006F8EED /* dyecolor.h */,
2B6B0E7A176BDEBE00930985 /* soundinfo.h */,
- 2B6B0E54176BDD7B00930985 /* avatardb.cpp */,
- 2B6B0E55176BDD7B00930985 /* avatardb.h */,
- 2BB28FB0172B43860046599B /* palettedb.cpp */,
- 2BB28FB1172B43860046599B /* palettedb.h */,
- 2B1E2224172AFBB500B7230A /* petdb.cpp */,
- 2B1E2225172AFBB500B7230A /* petdb.h */,
- 2B1E2210172AF91A00B7230A /* sounddb.cpp */,
- 2B1E2211172AF91A00B7230A /* sounddb.h */,
2BDF49E5166D5B680054E77F /* action.cpp */,
2BDF49E6166D5B680054E77F /* action.h */,
2BDF49E7166D5B680054E77F /* ambientlayer.cpp */,
@@ -3063,16 +3216,10 @@
2BDF49EC166D5B680054E77F /* atlasmanager.h */,
2BDF49ED166D5B680054E77F /* beinginfo.cpp */,
2BDF49EE166D5B680054E77F /* beinginfo.h */,
- 2BDF49EF166D5B680054E77F /* chardb.cpp */,
- 2BDF49F0166D5B680054E77F /* chardb.h */,
- 2BDF49F1166D5B680054E77F /* colordb.cpp */,
- 2BDF49F2166D5B680054E77F /* colordb.h */,
2BDF49F3166D5B680054E77F /* cursor.cpp */,
2BDF49F4166D5B680054E77F /* cursor.h */,
2BDF49F5166D5B680054E77F /* dye.cpp */,
2BDF49F6166D5B680054E77F /* dye.h */,
- 2BDF49F7166D5B680054E77F /* emotedb.cpp */,
- 2BDF49F8166D5B680054E77F /* emotedb.h */,
2BDF49F9166D5B680054E77F /* fboinfo.h */,
2BDF49FA166D5B680054E77F /* image.cpp */,
2BDF49FB166D5B680054E77F /* image.h */,
@@ -3082,18 +3229,10 @@
2BDF49FF166D5B680054E77F /* imageset.h */,
2BDF4A00166D5B680054E77F /* imagewriter.cpp */,
2BDF4A01166D5B680054E77F /* imagewriter.h */,
- 2BDF4A02166D5B680054E77F /* itemdb.cpp */,
- 2BDF4A03166D5B680054E77F /* itemdb.h */,
2BDF4A04166D5B680054E77F /* iteminfo.cpp */,
2BDF4A05166D5B680054E77F /* iteminfo.h */,
- 2BDF4A06166D5B680054E77F /* mapdb.cpp */,
- 2BDF4A07166D5B680054E77F /* mapdb.h */,
2BDF4A08166D5B680054E77F /* mapreader.cpp */,
2BDF4A09166D5B680054E77F /* mapreader.h */,
- 2BDF4A0A166D5B680054E77F /* monsterdb.cpp */,
- 2BDF4A0B166D5B680054E77F /* monsterdb.h */,
- 2BDF4A0C166D5B680054E77F /* npcdb.cpp */,
- 2BDF4A0D166D5B680054E77F /* npcdb.h */,
2BDF4A0E166D5B680054E77F /* openglimagehelper.cpp */,
2BDF4A0F166D5B680054E77F /* openglimagehelper.h */,
2BDF4A10166D5B680054E77F /* resource.cpp */,
@@ -3132,6 +3271,20 @@
2BDF4A4A166D5B680054E77F /* utils */ = {
isa = PBXGroup;
children = (
+ 2B9A1A54188F3DE6005F72F1 /* timer.cpp */,
+ 2B9A1A55188F3DE6005F72F1 /* timer.h */,
+ 2B121810182712A6006F8EED /* files.cpp */,
+ 2B121811182712A6006F8EED /* files.h */,
+ 2B121812182712A6006F8EED /* sdlcheckutils.cpp */,
+ 2B121813182712A6006F8EED /* sdlcheckutils.h */,
+ 2B121814182712A6006F8EED /* sdlhelper.cpp */,
+ 2B121815182712A6006F8EED /* physfscheckutils.cpp */,
+ 2B121816182712A6006F8EED /* physfscheckutils.h */,
+ 2B121817182712A6006F8EED /* sdl2helper.cpp */,
+ 2B121818182712A6006F8EED /* sdl2helper.h */,
+ 2B121819182712A6006F8EED /* sdlhelper.h */,
+ 2B12181A182712A6006F8EED /* fuzzer.cpp */,
+ 2B12181B182712A6006F8EED /* fuzzer.h */,
2B6B0E4F176BDD3000930985 /* cpu.cpp */,
2B6B0E50176BDD3000930985 /* cpu.h */,
2B7A5E5B16D82A3E0020A1C1 /* physfstools.cpp */,
@@ -3387,123 +3540,94 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 2B72F2C718271656003A9FB7 /* textdialog.cpp in Sources */,
2B1711951686A98C002E9493 /* AppDelegate.m in Sources */,
2B1711961686A98C002E9493 /* actionmanager.cpp in Sources */,
- 2B1711971686A98C002E9493 /* actor.cpp in Sources */,
- 2B1711981686A98C002E9493 /* actorsprite.cpp in Sources */,
- 2B1711991686A98C002E9493 /* actorspritemanager.cpp in Sources */,
+ 2B12180F1827120D006F8EED /* surfacegraphics.cpp in Sources */,
+ 2B1217ED1827120D006F8EED /* keyinput.cpp in Sources */,
2B17119A1686A98C002E9493 /* animatedsprite.cpp in Sources */,
2B17119B1686A98C002E9493 /* animationdelayload.cpp in Sources */,
- 2B17119C1686A98C002E9493 /* animationparticle.cpp in Sources */,
2B17119E1686A98C002E9493 /* avatar.cpp in Sources */,
- 2B17119F1686A98C002E9493 /* being.cpp in Sources */,
2B1711A21686A98C002E9493 /* chatlogger.cpp in Sources */,
2B1711A31686A98C002E9493 /* client.cpp in Sources */,
2B1711A41686A98C002E9493 /* commandhandler.cpp in Sources */,
+ 2B72F3721827175B003A9FB7 /* setup_video.cpp in Sources */,
+ 2B1217FF1827120D006F8EED /* mobileopenglgraphics.cpp in Sources */,
2B1711A51686A98C002E9493 /* commands.cpp in Sources */,
- 2B1711A61686A98C002E9493 /* compoundsprite.cpp in Sources */,
+ 2B72F30918271727003A9FB7 /* chardb.cpp in Sources */,
2B1711A71686A98C002E9493 /* configuration.cpp in Sources */,
2B1711A81686A98C002E9493 /* debug_new.cpp in Sources */,
+ 2B72F3621827175B003A9FB7 /* setup_input.cpp in Sources */,
2B1711A91686A98C002E9493 /* defaults.cpp in Sources */,
+ 2B72F30F18271727003A9FB7 /* emotedb.cpp in Sources */,
2B1711AA1686A98C002E9493 /* depricatedevent.cpp in Sources */,
+ 2B72F3761827175B003A9FB7 /* setuptab.cpp in Sources */,
+ 2B72F31918271727003A9FB7 /* palettedb.cpp in Sources */,
2B1711AB1686A98C002E9493 /* dropshortcut.cpp in Sources */,
+ 2B72F2BD18271656003A9FB7 /* shortcutwindow.cpp in Sources */,
+ 2B72F2A918271656003A9FB7 /* npcpostdialog.cpp in Sources */,
2B1711AC1686A98C002E9493 /* effectmanager.cpp in Sources */,
2B1711AD1686A98C002E9493 /* emoteshortcut.cpp in Sources */,
2B1711AE1686A98C002E9493 /* flooritem.cpp in Sources */,
+ 2B72F3741827175B003A9FB7 /* setup_visual.cpp in Sources */,
2B1711AF1686A98C002E9493 /* game.cpp in Sources */,
- 2B1711B01686A98C002E9493 /* graphics.cpp in Sources */,
2B1711B11686A98C002E9493 /* graphicsmanager.cpp in Sources */,
+ 2B72F29F18271656003A9FB7 /* killstats.cpp in Sources */,
2B1711B21686A98C002E9493 /* graphicsvertexes.cpp in Sources */,
- 2B1711B31686A98C002E9493 /* beingpopup.cpp in Sources */,
- 2B1711B41686A98C002E9493 /* botcheckerwindow.cpp in Sources */,
- 2B1711B51686A98C002E9493 /* buydialog.cpp in Sources */,
- 2B1711B61686A98C002E9493 /* buyselldialog.cpp in Sources */,
- 2B1711B71686A98C002E9493 /* changeemaildialog.cpp in Sources */,
- 2B1711B81686A98C002E9493 /* changepassworddialog.cpp in Sources */,
- 2B1711B91686A98C002E9493 /* charcreatedialog.cpp in Sources */,
- 2B1711BA1686A98C002E9493 /* charselectdialog.cpp in Sources */,
- 2B1711BB1686A98C002E9493 /* chatwindow.cpp in Sources */,
- 2B1711BC1686A98C002E9493 /* confirmdialog.cpp in Sources */,
- 2B1711BD1686A98C002E9493 /* connectiondialog.cpp in Sources */,
- 2B1711BE1686A98C002E9493 /* debugwindow.cpp in Sources */,
- 2B1711BF1686A98C002E9493 /* didyouknowwindow.cpp in Sources */,
- 2B1711C01686A98C002E9493 /* editdialog.cpp in Sources */,
- 2B1711C11686A98C002E9493 /* editserverdialog.cpp in Sources */,
- 2B1711C21686A98C002E9493 /* equipmentwindow.cpp in Sources */,
+ 2B12180D1827120D006F8EED /* sdlgraphics.cpp in Sources */,
+ 2B72F36C1827175B003A9FB7 /* setup_relations.cpp in Sources */,
2B1711C31686A98C002E9493 /* focushandler.cpp in Sources */,
+ 2B12183C182712DC006F8EED /* surfaceimagehelper.cpp in Sources */,
2B1711C41686A98C002E9493 /* gui.cpp in Sources */,
- 2B1711C51686A98C002E9493 /* helpwindow.cpp in Sources */,
- 2B1711C61686A98C002E9493 /* inventorywindow.cpp in Sources */,
- 2B1711C71686A98C002E9493 /* itemamountwindow.cpp in Sources */,
- 2B1711C81686A98C002E9493 /* itempopup.cpp in Sources */,
- 2B1711C91686A98C002E9493 /* killstats.cpp in Sources */,
- 2B1711CA1686A98C002E9493 /* logindialog.cpp in Sources */,
- 2B1711CB1686A98C002E9493 /* minimap.cpp in Sources */,
- 2B1711CC1686A98C002E9493 /* ministatuswindow.cpp in Sources */,
- 2B1711CD1686A98C002E9493 /* npcdialog.cpp in Sources */,
- 2B1711CE1686A98C002E9493 /* npcpostdialog.cpp in Sources */,
- 2B1711CF1686A98C002E9493 /* okdialog.cpp in Sources */,
- 2B1711D01686A98C002E9493 /* outfitwindow.cpp in Sources */,
+ 2B1217DF1827120D006F8EED /* playerinfo.cpp in Sources */,
+ 2B72F36A1827175B003A9FB7 /* setup_players.cpp in Sources */,
+ 2B12184A1827137F006F8EED /* emotepage.cpp in Sources */,
+ 2B72F27B18271656003A9FB7 /* buydialog.cpp in Sources */,
2B1711D11686A98C002E9493 /* palette.cpp in Sources */,
- 2B1711D21686A98C002E9493 /* popupmenu.cpp in Sources */,
- 2B1711D31686A98C002E9493 /* questswindow.cpp in Sources */,
- 2B1711D41686A98C002E9493 /* quitdialog.cpp in Sources */,
- 2B1711D51686A98C002E9493 /* registerdialog.cpp in Sources */,
+ 2B1218481827137F006F8EED /* colorpage.cpp in Sources */,
2B1711D61686A98C002E9493 /* sdlfont.cpp in Sources */,
2B1711D71686A98C002E9493 /* sdlinput.cpp in Sources */,
- 2B1711D81686A98C002E9493 /* selldialog.cpp in Sources */,
- 2B1711D91686A98C002E9493 /* serverdialog.cpp in Sources */,
- 2B1711DA1686A98C002E9493 /* setup.cpp in Sources */,
- 2B1711DB1686A98C002E9493 /* setup_audio.cpp in Sources */,
- 2B1711DC1686A98C002E9493 /* setup_chat.cpp in Sources */,
- 2B1711DD1686A98C002E9493 /* setup_colors.cpp in Sources */,
- 2B1711DE1686A98C002E9493 /* setup_input.cpp in Sources */,
- 2B1711DF1686A98C002E9493 /* setup_joystick.cpp in Sources */,
- 2B1711E01686A98C002E9493 /* setup_other.cpp in Sources */,
- 2B1711E11686A98C002E9493 /* setup_perfomance.cpp in Sources */,
- 2B1711E21686A98C002E9493 /* setup_players.cpp in Sources */,
- 2B1711E31686A98C002E9493 /* setup_relations.cpp in Sources */,
- 2B1711E41686A98C002E9493 /* setup_theme.cpp in Sources */,
- 2B1711E51686A98C002E9493 /* setup_video.cpp in Sources */,
- 2B1711E61686A98C002E9493 /* setup_visual.cpp in Sources */,
- 2B1711E71686A98C002E9493 /* shopwindow.cpp in Sources */,
- 2B1711E81686A98C002E9493 /* shortcutwindow.cpp in Sources */,
- 2B1711E91686A98C002E9493 /* skilldialog.cpp in Sources */,
- 2B1711EA1686A98C002E9493 /* socialwindow.cpp in Sources */,
- 2B1711EB1686A98C002E9493 /* speechbubble.cpp in Sources */,
- 2B1711EC1686A98C002E9493 /* spellpopup.cpp in Sources */,
- 2B1711ED1686A98C002E9493 /* statuspopup.cpp in Sources */,
- 2B1711EE1686A98C002E9493 /* statuswindow.cpp in Sources */,
- 2B1711EF1686A98C002E9493 /* textcommandeditor.cpp in Sources */,
- 2B1711F01686A98C002E9493 /* textdialog.cpp in Sources */,
- 2B1711F11686A98C002E9493 /* textpopup.cpp in Sources */,
+ 2B1217E51827120D006F8EED /* inputmanager.cpp in Sources */,
+ 2B1217D71827120D006F8EED /* actorsprite.cpp in Sources */,
+ 2B1217F91827120D006F8EED /* rotationalparticle.cpp in Sources */,
2B1711F21686A98C002E9493 /* theme.cpp in Sources */,
- 2B1711F31686A98C002E9493 /* tradewindow.cpp in Sources */,
- 2B1711F41686A98C002E9493 /* unregisterdialog.cpp in Sources */,
- 2B1711F51686A98C002E9493 /* updaterwindow.cpp in Sources */,
2B1711F61686A98C002E9493 /* userpalette.cpp in Sources */,
2B1711F71686A98C002E9493 /* viewport.cpp in Sources */,
- 2B1711F81686A98C002E9493 /* whoisonline.cpp in Sources */,
+ 2B72F37C1827175B003A9FB7 /* tradetab.cpp in Sources */,
2B1711F91686A98C002E9493 /* avatarlistbox.cpp in Sources */,
- 2B1711FA1686A98C002E9493 /* battletab.cpp in Sources */,
+ 2B72F29518271656003A9FB7 /* emotewindow.cpp in Sources */,
+ 2B72F28D18271656003A9FB7 /* debugwindow.cpp in Sources */,
2B1711FB1686A98C002E9493 /* browserbox.cpp in Sources */,
2B1711FC1686A98C002E9493 /* button.cpp in Sources */,
- 2B1711FE1686A98C002E9493 /* chattab.cpp in Sources */,
2B1711FF1686A98C002E9493 /* checkbox.cpp in Sources */,
2B1712001686A98C002E9493 /* container.cpp in Sources */,
+ 2B1218051827120D006F8EED /* renderers.cpp in Sources */,
+ 2B72F28318271656003A9FB7 /* charcreatedialog.cpp in Sources */,
2B1712011686A98C002E9493 /* desktop.cpp in Sources */,
+ 2B72F2EC182716F1003A9FB7 /* multitouchmanager.cpp in Sources */,
+ 2B72F26D18271656003A9FB7 /* itempopup.cpp in Sources */,
2B1712021686A98C002E9493 /* dropdown.cpp in Sources */,
2B1712031686A98C002E9493 /* dropshortcutcontainer.cpp in Sources */,
+ 2B121836182712DC006F8EED /* beingcommon.cpp in Sources */,
2B1712041686A98C002E9493 /* emoteshortcutcontainer.cpp in Sources */,
+ 2B121823182712A6006F8EED /* physfscheckutils.cpp in Sources */,
+ 2B72F2DF182716C1003A9FB7 /* itemsoundmanager.cpp in Sources */,
2B1712051686A98C002E9493 /* extendedlistbox.cpp in Sources */,
2B1712061686A98C002E9493 /* extendednamesmodel.cpp in Sources */,
+ 2B72F2B318271656003A9FB7 /* registerdialog.cpp in Sources */,
+ 2B1217D91827120D006F8EED /* being.cpp in Sources */,
+ 2B72F27718271656003A9FB7 /* textpopup.cpp in Sources */,
2B1712071686A98C002E9493 /* flowcontainer.cpp in Sources */,
- 2B1712081686A98C002E9493 /* guildchattab.cpp in Sources */,
+ 2B72F3541827175B003A9FB7 /* chattab.cpp in Sources */,
+ 2B12180B1827120D006F8EED /* sdl2softwaregraphics.cpp in Sources */,
2B1712091686A98C002E9493 /* guitable.cpp in Sources */,
2B17120A1686A98C002E9493 /* horizontcontainer.cpp in Sources */,
2B17120B1686A98C002E9493 /* icon.cpp in Sources */,
+ 2B72F27D18271656003A9FB7 /* buyselldialog.cpp in Sources */,
2B17120C1686A98C002E9493 /* inttextfield.cpp in Sources */,
2B17120D1686A98C002E9493 /* itemcontainer.cpp in Sources */,
+ 2B9A1A52188F3DAD005F72F1 /* pethandler.cpp in Sources */,
+ 2B72F3681827175B003A9FB7 /* setup_perfomance.cpp in Sources */,
2B17120E1686A98C002E9493 /* itemlinkhandler.cpp in Sources */,
2B17120F1686A98C002E9493 /* itemshortcutcontainer.cpp in Sources */,
2B1712101686A98C002E9493 /* label.cpp in Sources */,
@@ -3511,97 +3635,117 @@
2B1712121686A98C002E9493 /* layouthelper.cpp in Sources */,
2B1712131686A98C002E9493 /* listbox.cpp in Sources */,
2B1712141686A98C002E9493 /* namesmodel.cpp in Sources */,
+ 2B72F31518271727003A9FB7 /* monsterdb.cpp in Sources */,
2B1712151686A98C002E9493 /* passwordfield.cpp in Sources */,
+ 2B72F2A318271656003A9FB7 /* minimap.cpp in Sources */,
+ 2B72F30B18271727003A9FB7 /* colordb.cpp in Sources */,
2B1712161686A98C002E9493 /* playerbox.cpp in Sources */,
2B1712171686A98C002E9493 /* popup.cpp in Sources */,
2B1712181686A98C002E9493 /* progressbar.cpp in Sources */,
2B1712191686A98C002E9493 /* progressindicator.cpp in Sources */,
2B17121A1686A98C002E9493 /* radiobutton.cpp in Sources */,
2B17121B1686A98C002E9493 /* radiogroup.cpp in Sources */,
+ 2B72F29B18271656003A9FB7 /* inventorywindow.cpp in Sources */,
+ 2B72F2B118271656003A9FB7 /* quitdialog.cpp in Sources */,
2B17121C1686A98C002E9493 /* scrollarea.cpp in Sources */,
+ 2B72F30D18271727003A9FB7 /* deaddb.cpp in Sources */,
2B17121D1686A98C002E9493 /* setupitem.cpp in Sources */,
- 2B17121E1686A98C002E9493 /* setuptab.cpp in Sources */,
- 2B17121F1686A98C002E9493 /* setuptabscroll.cpp in Sources */,
+ 2B1218011827120D006F8EED /* normalopenglgraphics.cpp in Sources */,
2B1712201686A98C002E9493 /* shopitems.cpp in Sources */,
+ 2B72F27918271656003A9FB7 /* botcheckerwindow.cpp in Sources */,
2B1712211686A98C002E9493 /* shoplistbox.cpp in Sources */,
2B1712221686A98C002E9493 /* shortcutcontainer.cpp in Sources */,
2B1712231686A98C002E9493 /* slider.cpp in Sources */,
+ 2B72F3581827175B003A9FB7 /* guildchattab.cpp in Sources */,
2B1712241686A98C002E9493 /* sliderlist.cpp in Sources */,
2B1712251686A98C002E9493 /* spellshortcutcontainer.cpp in Sources */,
- 2B1712261686A98C002E9493 /* tab.cpp in Sources */,
2B1712271686A98C002E9493 /* tabbedarea.cpp in Sources */,
2B1712281686A98C002E9493 /* tablemodel.cpp in Sources */,
2B1712291686A98C002E9493 /* tabstrip.cpp in Sources */,
2B17122A1686A98C002E9493 /* textbox.cpp in Sources */,
2B17122B1686A98C002E9493 /* textfield.cpp in Sources */,
+ 2B1217E11827120D006F8EED /* playerrelations.cpp in Sources */,
2B17122C1686A98C002E9493 /* textpreview.cpp in Sources */,
- 2B17122D1686A98C002E9493 /* tradetab.cpp in Sources */,
2B17122E1686A98C002E9493 /* vertcontainer.cpp in Sources */,
- 2B17122F1686A98C002E9493 /* whispertab.cpp in Sources */,
2B1712301686A98C002E9493 /* widgetgroup.cpp in Sources */,
+ 2B12178C182711F8006F8EED /* mapheights.cpp in Sources */,
2B1712311686A98C002E9493 /* window.cpp in Sources */,
+ 2B72F3521827175B003A9FB7 /* battletab.cpp in Sources */,
2B1712321686A98C002E9493 /* windowcontainer.cpp in Sources */,
2B1712331686A98C002E9493 /* windowmenu.cpp in Sources */,
- 2B1712341686A98C002E9493 /* worldselectdialog.cpp in Sources */,
+ 2B9A1A49188F3D40005F72F1 /* setup_mods.cpp in Sources */,
2B1712351686A98C002E9493 /* actionevent.cpp in Sources */,
2B1712361686A98C002E9493 /* basiccontainer.cpp in Sources */,
+ 2B72F28F18271656003A9FB7 /* didyouknowwindow.cpp in Sources */,
2B1712371686A98C002E9493 /* cliprectangle.cpp in Sources */,
2B1712381686A98C002E9493 /* color.cpp in Sources */,
2B1712391686A98C002E9493 /* event.cpp in Sources */,
2B17123A1686A98C002E9493 /* exception.cpp in Sources */,
2B17123B1686A98C002E9493 /* focushandler.cpp in Sources */,
+ 2B1217DD1827120D006F8EED /* localplayer.cpp in Sources */,
+ 2B72F28918271656003A9FB7 /* confirmdialog.cpp in Sources */,
2B17123C1686A98C002E9493 /* font.cpp in Sources */,
2B17123D1686A98C002E9493 /* graphics.cpp in Sources */,
2B17123E1686A98C002E9493 /* gui.cpp in Sources */,
2B17123F1686A98C002E9493 /* image.cpp in Sources */,
+ 2B12184C1827137F006F8EED /* colormodel.cpp in Sources */,
2B1712401686A98C002E9493 /* inputevent.cpp in Sources */,
2B1712411686A98C002E9493 /* key.cpp in Sources */,
+ 2B72F2A518271656003A9FB7 /* ministatuswindow.cpp in Sources */,
2B1712421686A98C002E9493 /* keyevent.cpp in Sources */,
2B1712431686A98C002E9493 /* keyinput.cpp in Sources */,
+ 2B72F37E1827175B003A9FB7 /* whispertab.cpp in Sources */,
2B1712441686A98C002E9493 /* mouseevent.cpp in Sources */,
2B1712451686A98C002E9493 /* mouseinput.cpp in Sources */,
2B1712461686A98C002E9493 /* rectangle.cpp in Sources */,
- 2B1712471686A98C002E9493 /* sdlgraphics.cpp in Sources */,
2B1712481686A98C002E9493 /* selectionevent.cpp in Sources */,
2B1712491686A98C002E9493 /* widget.cpp in Sources */,
2B17124A1686A98C002E9493 /* button.cpp in Sources */,
+ 2B72F2A118271656003A9FB7 /* logindialog.cpp in Sources */,
+ 2B72F27518271656003A9FB7 /* statuspopup.cpp in Sources */,
2B17124B1686A98C002E9493 /* checkbox.cpp in Sources */,
+ 2B9A1A5F188F3EE4005F72F1 /* moddb.cpp in Sources */,
2B17124C1686A98C002E9493 /* container.cpp in Sources */,
2B17124D1686A98C002E9493 /* label.cpp in Sources */,
+ 2B72F28118271656003A9FB7 /* changepassworddialog.cpp in Sources */,
2B17124E1686A98C002E9493 /* listbox.cpp in Sources */,
2B17124F1686A98C002E9493 /* radiobutton.cpp in Sources */,
2B1712501686A98C002E9493 /* scrollarea.cpp in Sources */,
+ 2B72F2CD18271656003A9FB7 /* updaterwindow.cpp in Sources */,
+ 2B121821182712A6006F8EED /* sdlhelper.cpp in Sources */,
+ 2B72F2C318271656003A9FB7 /* statuswindow.cpp in Sources */,
2B1712511686A98C002E9493 /* slider.cpp in Sources */,
2B1712521686A98C002E9493 /* textbox.cpp in Sources */,
2B1712531686A98C002E9493 /* textfield.cpp in Sources */,
+ 2B1217F51827120D006F8EED /* particlecontainer.cpp in Sources */,
+ 2B72F37A1827175B003A9FB7 /* tab.cpp in Sources */,
2B1712541686A98C002E9493 /* window.cpp in Sources */,
2B1712551686A98C002E9493 /* guild.cpp in Sources */,
2B1712561686A98C002E9493 /* guildmanager.cpp in Sources */,
- 2B1712571686A98C002E9493 /* imageparticle.cpp in Sources */,
2B1712581686A98C002E9493 /* imagesprite.cpp in Sources */,
- 2B1712591686A98C002E9493 /* inputevent.cpp in Sources */,
- 2B17125A1686A98C002E9493 /* inputmanager.cpp in Sources */,
+ 2B72F28718271656003A9FB7 /* chatwindow.cpp in Sources */,
2B17125B1686A98C002E9493 /* inventory.cpp in Sources */,
2B17125C1686A98C002E9493 /* item.cpp in Sources */,
2B17125D1686A98C002E9493 /* itemshortcut.cpp in Sources */,
- 2B17125E1686A98C002E9493 /* joystick.cpp in Sources */,
- 2B17125F1686A98C002E9493 /* keyboardconfig.cpp in Sources */,
- 2B1712601686A98C002E9493 /* keyevent.cpp in Sources */,
- 2B1712611686A98C002E9493 /* keyinput.cpp in Sources */,
- 2B1712631686A98C002E9493 /* localplayer.cpp in Sources */,
+ 2B72F2DB182716C1003A9FB7 /* actormanager.cpp in Sources */,
+ 2B72F35E1827175B003A9FB7 /* setup_chat.cpp in Sources */,
2B1712641686A98C002E9493 /* logger.cpp in Sources */,
2B1712651686A98C002E9493 /* main.cpp in Sources */,
2B1712661686A98C002E9493 /* map.cpp in Sources */,
+ 2B72F2C518271656003A9FB7 /* textcommandeditor.cpp in Sources */,
+ 2B12181D182712A6006F8EED /* files.cpp in Sources */,
2B1712671686A98C002E9493 /* maplayer.cpp in Sources */,
- 2B1712681686A98C002E9493 /* mgl.cpp in Sources */,
- 2B1712691686A98C002E9493 /* mobileopenglgraphics.cpp in Sources */,
2B17126A1686A98C002E9493 /* mouseinput.cpp in Sources */,
2B17126B1686A98C002E9493 /* mumblemanager.cpp in Sources */,
2B17126D1686A98C002E9493 /* download.cpp in Sources */,
+ 2B72F3601827175B003A9FB7 /* setup_colors.cpp in Sources */,
2B17126E1686A98C002E9493 /* adminhandler.cpp in Sources */,
+ 2B121825182712A6006F8EED /* sdl2helper.cpp in Sources */,
2B17126F1686A98C002E9493 /* beinghandler.cpp in Sources */,
2B1712701686A98C002E9493 /* buysellhandler.cpp in Sources */,
+ 2B72F28518271656003A9FB7 /* charselectdialog.cpp in Sources */,
2B1712711686A98C002E9493 /* charserverhandler.cpp in Sources */,
+ 2B72F29118271656003A9FB7 /* editdialog.cpp in Sources */,
2B1712721686A98C002E9493 /* chathandler.cpp in Sources */,
2B1712731686A98C002E9493 /* gamehandler.cpp in Sources */,
2B1712741686A98C002E9493 /* guildtab.cpp in Sources */,
@@ -3609,19 +3753,25 @@
2B1712761686A98C002E9493 /* guildhandler.cpp in Sources */,
2B1712771686A98C002E9493 /* inventoryhandler.cpp in Sources */,
2B1712781686A98C002E9493 /* itemhandler.cpp in Sources */,
+ 2B72F27F18271656003A9FB7 /* changeemaildialog.cpp in Sources */,
2B1712791686A98C002E9493 /* loginhandler.cpp in Sources */,
2B17127A1686A98C002E9493 /* network.cpp in Sources */,
2B17127B1686A98C002E9493 /* npchandler.cpp in Sources */,
2B17127C1686A98C002E9493 /* partyhandler.cpp in Sources */,
2B17127D1686A98C002E9493 /* playerhandler.cpp in Sources */,
+ 2B72F2BB18271656003A9FB7 /* shopwindow.cpp in Sources */,
2B17127F1686A98C002E9493 /* tradehandler.cpp in Sources */,
2B1712801686A98C002E9493 /* adminhandler.cpp in Sources */,
+ 2B1218031827120D006F8EED /* nullopenglgraphics.cpp in Sources */,
2B1712811686A98C002E9493 /* beinghandler.cpp in Sources */,
2B1712821686A98C002E9493 /* buysellhandler.cpp in Sources */,
+ 2B72F3561827175B003A9FB7 /* gmtab.cpp in Sources */,
2B1712831686A98C002E9493 /* charserverhandler.cpp in Sources */,
2B1712841686A98C002E9493 /* chathandler.cpp in Sources */,
+ 2B72F2B918271656003A9FB7 /* setup.cpp in Sources */,
2B1712851686A98C002E9493 /* gamehandler.cpp in Sources */,
2B1712861686A98C002E9493 /* generalhandler.cpp in Sources */,
+ 2B1217FD1827120D006F8EED /* graphics.cpp in Sources */,
2B1712871686A98C002E9493 /* guildtab.cpp in Sources */,
2B1712881686A98C002E9493 /* partytab.cpp in Sources */,
2B1712891686A98C002E9493 /* guildhandler.cpp in Sources */,
@@ -3630,80 +3780,104 @@
2B17128C1686A98C002E9493 /* loginhandler.cpp in Sources */,
2B17128D1686A98C002E9493 /* messagehandler.cpp in Sources */,
2B17128E1686A98C002E9493 /* messagein.cpp in Sources */,
+ 2B72F3641827175B003A9FB7 /* setup_joystick.cpp in Sources */,
2B17128F1686A98C002E9493 /* messageout.cpp in Sources */,
2B1712901686A98C002E9493 /* network.cpp in Sources */,
+ 2B72F36E1827175B003A9FB7 /* setup_theme.cpp in Sources */,
2B1712911686A98C002E9493 /* npchandler.cpp in Sources */,
2B1712921686A98C002E9493 /* partyhandler.cpp in Sources */,
+ 2B72F2BF18271656003A9FB7 /* skilldialog.cpp in Sources */,
2B1712931686A98C002E9493 /* playerhandler.cpp in Sources */,
2B1712951686A98C002E9493 /* tradehandler.cpp in Sources */,
2B1712961686A98C002E9493 /* messagein.cpp in Sources */,
+ 2B72F3661827175B003A9FB7 /* setup_other.cpp in Sources */,
+ 2B1217FB1827120D006F8EED /* textparticle.cpp in Sources */,
2B1712971686A98C002E9493 /* messageout.cpp in Sources */,
2B1712981686A98C002E9493 /* net.cpp in Sources */,
2B1712991686A98C002E9493 /* packetcounters.cpp in Sources */,
2B17129A1686A98C002E9493 /* adminhandler.cpp in Sources */,
+ 2B72F31D18271727003A9FB7 /* sounddb.cpp in Sources */,
2B17129B1686A98C002E9493 /* beinghandler.cpp in Sources */,
2B17129C1686A98C002E9493 /* buysellhandler.cpp in Sources */,
2B17129D1686A98C002E9493 /* charserverhandler.cpp in Sources */,
+ 2B72F35A1827175B003A9FB7 /* langtab.cpp in Sources */,
+ 2B72F2CB18271656003A9FB7 /* unregisterdialog.cpp in Sources */,
+ 2B1217D51827120D006F8EED /* actor.cpp in Sources */,
2B17129E1686A98C002E9493 /* chathandler.cpp in Sources */,
+ 2B72F30718271727003A9FB7 /* avatardb.cpp in Sources */,
2B17129F1686A98C002E9493 /* gamehandler.cpp in Sources */,
+ 2B12183A182712DC006F8EED /* sdl2softwareimagehelper.cpp in Sources */,
2B1712A01686A98C002E9493 /* generalhandler.cpp in Sources */,
2B1712A11686A98C002E9493 /* guildtab.cpp in Sources */,
+ 2B72F3211827173C003A9FB7 /* mgl.cpp in Sources */,
2B1712A21686A98C002E9493 /* partytab.cpp in Sources */,
+ 2B72F3781827175B003A9FB7 /* setuptabscroll.cpp in Sources */,
2B1712A31686A98C002E9493 /* guildhandler.cpp in Sources */,
+ 2B72F31318271727003A9FB7 /* mapdb.cpp in Sources */,
2B1712A41686A98C002E9493 /* inventoryhandler.cpp in Sources */,
2B1712A51686A98C002E9493 /* itemhandler.cpp in Sources */,
2B1712A61686A98C002E9493 /* loginhandler.cpp in Sources */,
+ 2B1217E31827120D006F8EED /* inputevent.cpp in Sources */,
2B1712A71686A98C002E9493 /* messagehandler.cpp in Sources */,
+ 2B1217EF1827120D006F8EED /* animationparticle.cpp in Sources */,
2B1712A81686A98C002E9493 /* messagein.cpp in Sources */,
+ 2B1217DB1827120D006F8EED /* compoundsprite.cpp in Sources */,
2B1712A91686A98C002E9493 /* messageout.cpp in Sources */,
2B1712AA1686A98C002E9493 /* network.cpp in Sources */,
+ 2B1217E71827120D006F8EED /* joystick.cpp in Sources */,
2B1712AB1686A98C002E9493 /* npchandler.cpp in Sources */,
+ 2B72F2C918271656003A9FB7 /* tradewindow.cpp in Sources */,
2B1712AC1686A98C002E9493 /* partyhandler.cpp in Sources */,
2B1712AD1686A98C002E9493 /* playerhandler.cpp in Sources */,
+ 2B1218091827120D006F8EED /* sdl2graphics.cpp in Sources */,
+ 2B72F2D118271656003A9FB7 /* worldselectdialog.cpp in Sources */,
+ 2B9A1A57188F3DE6005F72F1 /* timer.cpp in Sources */,
2B1712AE1686A98C002E9493 /* questhandler.cpp in Sources */,
2B1712B01686A98C002E9493 /* tradehandler.cpp in Sources */,
- 2B1712B11686A98C002E9493 /* normalopenglgraphics.cpp in Sources */,
- 2B1712B21686A98C002E9493 /* particle.cpp in Sources */,
- 2B1712B31686A98C002E9493 /* particlecontainer.cpp in Sources */,
- 2B1712B41686A98C002E9493 /* particleemitter.cpp in Sources */,
2B1712B51686A98C002E9493 /* party.cpp in Sources */,
- 2B1712B61686A98C002E9493 /* playerinfo.cpp in Sources */,
- 2B1712B71686A98C002E9493 /* playerrelations.cpp in Sources */,
+ 2B121827182712A6006F8EED /* fuzzer.cpp in Sources */,
2B1712B81686A98C002E9493 /* position.cpp in Sources */,
2B1712B91686A98C002E9493 /* action.cpp in Sources */,
+ 2B72F2CF18271656003A9FB7 /* whoisonline.cpp in Sources */,
+ 2B72F29718271656003A9FB7 /* equipmentwindow.cpp in Sources */,
+ 2B72F3701827175B003A9FB7 /* setup_touch.cpp in Sources */,
2B1712BA1686A98C002E9493 /* ambientlayer.cpp in Sources */,
2B1712BB1686A98C002E9493 /* animation.cpp in Sources */,
+ 2B72F2DD182716C1003A9FB7 /* eventsmanager.cpp in Sources */,
2B1712BC1686A98C002E9493 /* atlasmanager.cpp in Sources */,
2B1712BD1686A98C002E9493 /* beinginfo.cpp in Sources */,
- 2B1712BE1686A98C002E9493 /* chardb.cpp in Sources */,
- 2B1712BF1686A98C002E9493 /* colordb.cpp in Sources */,
+ 2B1217F71827120D006F8EED /* particleemitter.cpp in Sources */,
2B1712C01686A98C002E9493 /* cursor.cpp in Sources */,
+ 2B72F26B18271656003A9FB7 /* beingpopup.cpp in Sources */,
+ 2B72F2C118271656003A9FB7 /* socialwindow.cpp in Sources */,
2B1712C11686A98C002E9493 /* dye.cpp in Sources */,
- 2B1712C21686A98C002E9493 /* emotedb.cpp in Sources */,
+ 2B72F2B718271656003A9FB7 /* serverdialog.cpp in Sources */,
2B1712C31686A98C002E9493 /* image.cpp in Sources */,
+ 2B1217F31827120D006F8EED /* particle.cpp in Sources */,
2B1712C41686A98C002E9493 /* imagehelper.cpp in Sources */,
2B1712C51686A98C002E9493 /* imageset.cpp in Sources */,
2B1712C61686A98C002E9493 /* imagewriter.cpp in Sources */,
- 2B1712C71686A98C002E9493 /* itemdb.cpp in Sources */,
+ 2B1217EB1827120D006F8EED /* keyevent.cpp in Sources */,
2B1712C81686A98C002E9493 /* iteminfo.cpp in Sources */,
- 2B1712C91686A98C002E9493 /* mapdb.cpp in Sources */,
2B1712CA1686A98C002E9493 /* mapreader.cpp in Sources */,
- 2B1712CB1686A98C002E9493 /* monsterdb.cpp in Sources */,
- 2B1712CC1686A98C002E9493 /* npcdb.cpp in Sources */,
+ 2B72F2AF18271656003A9FB7 /* questswindow.cpp in Sources */,
2B1712CD1686A98C002E9493 /* openglimagehelper.cpp in Sources */,
2B1712CE1686A98C002E9493 /* resource.cpp in Sources */,
+ 2B72F2B518271656003A9FB7 /* selldialog.cpp in Sources */,
2B1712CF1686A98C002E9493 /* resourcemanager.cpp in Sources */,
+ 2B72F28B18271656003A9FB7 /* connectiondialog.cpp in Sources */,
+ 2B121838182712DC006F8EED /* sdl2imagehelper.cpp in Sources */,
2B1712D01686A98C002E9493 /* sdlimagehelper.cpp in Sources */,
+ 2B72F2A718271656003A9FB7 /* npcdialog.cpp in Sources */,
2B1712D11686A98C002E9493 /* sdlmusic.cpp in Sources */,
2B1712D21686A98C002E9493 /* soundeffect.cpp in Sources */,
2B1712D41686A98C002E9493 /* spritedef.cpp in Sources */,
2B1712D51686A98C002E9493 /* subimage.cpp in Sources */,
2B1712D61686A98C002E9493 /* wallpaper.cpp in Sources */,
- 2B1712D71686A98C002E9493 /* rotationalparticle.cpp in Sources */,
- 2B1712D81686A98C002E9493 /* safeopenglgraphics.cpp in Sources */,
2B1712D91686A98C002E9493 /* SDLMain.m in Sources */,
2B1712DA1686A98C002E9493 /* shopitem.cpp in Sources */,
2B1712DB1686A98C002E9493 /* simpleanimation.cpp in Sources */,
+ 2B72F29918271656003A9FB7 /* helpwindow.cpp in Sources */,
2B1712DC1686A98C002E9493 /* soundmanager.cpp in Sources */,
2B1712DD1686A98C002E9493 /* spellmanager.cpp in Sources */,
2B1712DE1686A98C002E9493 /* spellshortcut.cpp in Sources */,
@@ -3711,19 +3885,23 @@
2B1712E01686A98C002E9493 /* testlauncher.cpp in Sources */,
2B1712E11686A98C002E9493 /* testmain.cpp in Sources */,
2B1712E21686A98C002E9493 /* text.cpp in Sources */,
+ 2B72F31718271727003A9FB7 /* npcdb.cpp in Sources */,
2B1712E31686A98C002E9493 /* textcommand.cpp in Sources */,
2B1712E41686A98C002E9493 /* textmanager.cpp in Sources */,
- 2B1712E51686A98C002E9493 /* textparticle.cpp in Sources */,
2B1712E61686A98C002E9493 /* touchactions.cpp in Sources */,
2B1712E71686A98C002E9493 /* touchmanager.cpp in Sources */,
2B1712E81686A98C002E9493 /* units.cpp in Sources */,
2B1712E91686A98C002E9493 /* base64.cpp in Sources */,
2B1712EA1686A98C002E9493 /* checkutils.cpp in Sources */,
+ 2B72F31B18271727003A9FB7 /* petdb.cpp in Sources */,
2B1712EB1686A98C002E9493 /* copynpaste.cpp in Sources */,
+ 2B72F27318271656003A9FB7 /* spellpopup.cpp in Sources */,
2B1712EC1686A98C002E9493 /* langs.cpp in Sources */,
2B1712ED1686A98C002E9493 /* mkdir.cpp in Sources */,
2B1712EE1686A98C002E9493 /* paths.cpp in Sources */,
2B1712EF1686A98C002E9493 /* perfomance.cpp in Sources */,
+ 2B12181F182712A6006F8EED /* sdlcheckutils.cpp in Sources */,
+ 2B9A1A5B188F3EC6005F72F1 /* modinfo.cpp in Sources */,
2B1712F01686A98C002E9493 /* physfsrwops.cpp in Sources */,
2B1712F11686A98C002E9493 /* process.cpp in Sources */,
2B1712F21686A98C002E9493 /* specialfolder.cpp in Sources */,
@@ -3731,31 +3909,34 @@
2B1712F41686A98C002E9493 /* podict.cpp in Sources */,
2B1712F51686A98C002E9493 /* poparser.cpp in Sources */,
2B1712F61686A98C002E9493 /* translationmanager.cpp in Sources */,
+ 2B72F2AD18271656003A9FB7 /* outfitwindow.cpp in Sources */,
+ 2B1218071827120D006F8EED /* safeopenglgraphics.cpp in Sources */,
2B1712F71686A98C002E9493 /* xml.cpp in Sources */,
2B1712F81686A98C002E9493 /* vector.cpp in Sources */,
2B1712F91686A98C002E9493 /* popuplist.cpp in Sources */,
- 2B1712FA1686A98C002E9493 /* setup_touch.cpp in Sources */,
2BDFBEA016AB8D6B00D25914 /* setuptouchitem.cpp in Sources */,
2B7A5E5E16D82A3E0020A1C1 /* physfstools.cpp in Sources */,
- 2B7A5E6216D82C010020A1C1 /* gmtab.cpp in Sources */,
+ 2B72F27118271656003A9FB7 /* speechbubble.cpp in Sources */,
+ 2B72F2AB18271656003A9FB7 /* okdialog.cpp in Sources */,
2BFB6E3116E2AE69007EE3A6 /* skillhandler.cpp in Sources */,
2BFB6E3616E2AE99007EE3A6 /* skillhandler.cpp in Sources */,
2BFB6E3A16E2AEB9007EE3A6 /* skillhandler.cpp in Sources */,
2B65B45816EFC75D00AAD717 /* notifymanager.cpp in Sources */,
- 2B1E2213172AF91A00B7230A /* sounddb.cpp in Sources */,
+ 2B1217F11827120D006F8EED /* imageparticle.cpp in Sources */,
2B1E2219172AF96000B7230A /* auctionmanager.cpp in Sources */,
+ 2B1217E91827120D006F8EED /* keyboardconfig.cpp in Sources */,
+ 2B72F31118271727003A9FB7 /* itemdb.cpp in Sources */,
+ 2B72F29D18271656003A9FB7 /* itemamountwindow.cpp in Sources */,
2B1E221B172AF96000B7230A /* walklayer.cpp in Sources */,
- 2B1E221F172AF9E800B7230A /* langtab.cpp in Sources */,
+ 2B72F29318271656003A9FB7 /* editserverdialog.cpp in Sources */,
2B1E2223172AFA2100B7230A /* navigationmanager.cpp in Sources */,
- 2B1E2227172AFBB500B7230A /* petdb.cpp in Sources */,
2B1E222D172AFC4C00B7230A /* charserverhandler.cpp in Sources */,
2B1E222F172AFC4C00B7230A /* sdltcpnet.cpp in Sources */,
- 2BB28FB3172B43860046599B /* palettedb.cpp in Sources */,
- 2BB28FB7172B4CEF0046599B /* nullopenglgraphics.cpp in Sources */,
+ 2B72F26F18271656003A9FB7 /* popupmenu.cpp in Sources */,
2B6B0E52176BDD3000930985 /* cpu.cpp in Sources */,
- 2B6B0E57176BDD7B00930985 /* avatardb.cpp in Sources */,
2B6B0E5F176BDDC100930985 /* skilldata.cpp in Sources */,
2B6B0E61176BDDC100930985 /* skillinfo.cpp in Sources */,
+ 2B72F35C1827175B003A9FB7 /* setup_audio.cpp in Sources */,
2B6B0E63176BDDC100930985 /* skillmodel.cpp in Sources */,
2B6B0E67176BDDE100930985 /* depricatedlistener.cpp in Sources */,
2B6B0E6C176BDE0400930985 /* beingequipbackend.cpp in Sources */,
@@ -3769,123 +3950,94 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
+ 2B72F2C618271656003A9FB7 /* textdialog.cpp in Sources */,
2BDF45D7166D5AEC0054E77F /* AppDelegate.m in Sources */,
2BDF4A76166D5B690054E77F /* actionmanager.cpp in Sources */,
- 2BDF4A78166D5B690054E77F /* actor.cpp in Sources */,
- 2BDF4A7A166D5B690054E77F /* actorsprite.cpp in Sources */,
- 2BDF4A7C166D5B690054E77F /* actorspritemanager.cpp in Sources */,
+ 2B12180E1827120D006F8EED /* surfacegraphics.cpp in Sources */,
+ 2B1217EC1827120D006F8EED /* keyinput.cpp in Sources */,
2BDF4A7E166D5B690054E77F /* animatedsprite.cpp in Sources */,
2BDF4A80166D5B690054E77F /* animationdelayload.cpp in Sources */,
- 2BDF4A82166D5B690054E77F /* animationparticle.cpp in Sources */,
2BDF4A86166D5B690054E77F /* avatar.cpp in Sources */,
- 2BDF4A88166D5B690054E77F /* being.cpp in Sources */,
2BDF4A8E166D5B690054E77F /* chatlogger.cpp in Sources */,
2BDF4A90166D5B690054E77F /* client.cpp in Sources */,
2BDF4A92166D5B690054E77F /* commandhandler.cpp in Sources */,
+ 2B72F3711827175B003A9FB7 /* setup_video.cpp in Sources */,
+ 2B1217FE1827120D006F8EED /* mobileopenglgraphics.cpp in Sources */,
2BDF4A94166D5B690054E77F /* commands.cpp in Sources */,
- 2BDF4A96166D5B690054E77F /* compoundsprite.cpp in Sources */,
+ 2B72F30818271727003A9FB7 /* chardb.cpp in Sources */,
2BDF4A98166D5B690054E77F /* configuration.cpp in Sources */,
2BDF4A9A166D5B690054E77F /* debug_new.cpp in Sources */,
+ 2B72F3611827175B003A9FB7 /* setup_input.cpp in Sources */,
2BDF4A9C166D5B690054E77F /* defaults.cpp in Sources */,
+ 2B72F30E18271727003A9FB7 /* emotedb.cpp in Sources */,
2BDF4A9E166D5B690054E77F /* depricatedevent.cpp in Sources */,
+ 2B72F3751827175B003A9FB7 /* setuptab.cpp in Sources */,
+ 2B72F31818271727003A9FB7 /* palettedb.cpp in Sources */,
2BDF4AA0166D5B690054E77F /* dropshortcut.cpp in Sources */,
+ 2B72F2BC18271656003A9FB7 /* shortcutwindow.cpp in Sources */,
+ 2B72F2A818271656003A9FB7 /* npcpostdialog.cpp in Sources */,
2BDF4AA2166D5B690054E77F /* effectmanager.cpp in Sources */,
2BDF4AA4166D5B690054E77F /* emoteshortcut.cpp in Sources */,
2BDF4AAA166D5B690054E77F /* flooritem.cpp in Sources */,
+ 2B72F3731827175B003A9FB7 /* setup_visual.cpp in Sources */,
2BDF4AAC166D5B690054E77F /* game.cpp in Sources */,
- 2BDF4AAE166D5B690054E77F /* graphics.cpp in Sources */,
2BDF4AB0166D5B690054E77F /* graphicsmanager.cpp in Sources */,
+ 2B72F29E18271656003A9FB7 /* killstats.cpp in Sources */,
2BDF4AB2166D5B690054E77F /* graphicsvertexes.cpp in Sources */,
- 2BDF4AB4166D5B690054E77F /* beingpopup.cpp in Sources */,
- 2BDF4AB6166D5B690054E77F /* botcheckerwindow.cpp in Sources */,
- 2BDF4AB8166D5B690054E77F /* buydialog.cpp in Sources */,
- 2BDF4ABA166D5B690054E77F /* buyselldialog.cpp in Sources */,
- 2BDF4ABC166D5B690054E77F /* changeemaildialog.cpp in Sources */,
- 2BDF4ABE166D5B690054E77F /* changepassworddialog.cpp in Sources */,
- 2BDF4AC0166D5B690054E77F /* charcreatedialog.cpp in Sources */,
- 2BDF4AC2166D5B690054E77F /* charselectdialog.cpp in Sources */,
- 2BDF4AC4166D5B690054E77F /* chatwindow.cpp in Sources */,
- 2BDF4AC6166D5B690054E77F /* confirmdialog.cpp in Sources */,
- 2BDF4AC8166D5B690054E77F /* connectiondialog.cpp in Sources */,
- 2BDF4ACA166D5B690054E77F /* debugwindow.cpp in Sources */,
- 2BDF4ACC166D5B690054E77F /* didyouknowwindow.cpp in Sources */,
- 2BDF4ACE166D5B690054E77F /* editdialog.cpp in Sources */,
- 2BDF4AD0166D5B690054E77F /* editserverdialog.cpp in Sources */,
- 2BDF4AD2166D5B690054E77F /* equipmentwindow.cpp in Sources */,
+ 2B12180C1827120D006F8EED /* sdlgraphics.cpp in Sources */,
+ 2B72F36B1827175B003A9FB7 /* setup_relations.cpp in Sources */,
2BDF4AD4166D5B690054E77F /* focushandler.cpp in Sources */,
+ 2B12183B182712DC006F8EED /* surfaceimagehelper.cpp in Sources */,
2BDF4AD6166D5B690054E77F /* gui.cpp in Sources */,
- 2BDF4AD8166D5B690054E77F /* helpwindow.cpp in Sources */,
- 2BDF4ADA166D5B690054E77F /* inventorywindow.cpp in Sources */,
- 2BDF4ADC166D5B690054E77F /* itemamountwindow.cpp in Sources */,
- 2BDF4ADE166D5B690054E77F /* itempopup.cpp in Sources */,
- 2BDF4AE0166D5B690054E77F /* killstats.cpp in Sources */,
- 2BDF4AE2166D5B690054E77F /* logindialog.cpp in Sources */,
- 2BDF4AE4166D5B690054E77F /* minimap.cpp in Sources */,
- 2BDF4AE6166D5B690054E77F /* ministatuswindow.cpp in Sources */,
- 2BDF4AE8166D5B690054E77F /* npcdialog.cpp in Sources */,
- 2BDF4AEA166D5B690054E77F /* npcpostdialog.cpp in Sources */,
- 2BDF4AEC166D5B690054E77F /* okdialog.cpp in Sources */,
- 2BDF4AEE166D5B690054E77F /* outfitwindow.cpp in Sources */,
+ 2B1217DE1827120D006F8EED /* playerinfo.cpp in Sources */,
+ 2B72F3691827175B003A9FB7 /* setup_players.cpp in Sources */,
+ 2B1218491827137F006F8EED /* emotepage.cpp in Sources */,
+ 2B72F27A18271656003A9FB7 /* buydialog.cpp in Sources */,
2BDF4AF0166D5B690054E77F /* palette.cpp in Sources */,
- 2BDF4AF2166D5B690054E77F /* popupmenu.cpp in Sources */,
- 2BDF4AF4166D5B690054E77F /* questswindow.cpp in Sources */,
- 2BDF4AF6166D5B690054E77F /* quitdialog.cpp in Sources */,
- 2BDF4AF8166D5B690054E77F /* registerdialog.cpp in Sources */,
+ 2B1218471827137F006F8EED /* colorpage.cpp in Sources */,
2BDF4AFA166D5B690054E77F /* sdlfont.cpp in Sources */,
2BDF4AFC166D5B690054E77F /* sdlinput.cpp in Sources */,
- 2BDF4AFE166D5B690054E77F /* selldialog.cpp in Sources */,
- 2BDF4B00166D5B690054E77F /* serverdialog.cpp in Sources */,
- 2BDF4B02166D5B690054E77F /* setup.cpp in Sources */,
- 2BDF4B04166D5B690054E77F /* setup_audio.cpp in Sources */,
- 2BDF4B06166D5B690054E77F /* setup_chat.cpp in Sources */,
- 2BDF4B08166D5B690054E77F /* setup_colors.cpp in Sources */,
- 2BDF4B0A166D5B690054E77F /* setup_input.cpp in Sources */,
- 2BDF4B0C166D5B690054E77F /* setup_joystick.cpp in Sources */,
- 2BDF4B0E166D5B690054E77F /* setup_other.cpp in Sources */,
- 2BDF4B10166D5B690054E77F /* setup_perfomance.cpp in Sources */,
- 2BDF4B12166D5B690054E77F /* setup_players.cpp in Sources */,
- 2BDF4B14166D5B690054E77F /* setup_relations.cpp in Sources */,
- 2BDF4B16166D5B690054E77F /* setup_theme.cpp in Sources */,
- 2BDF4B18166D5B690054E77F /* setup_video.cpp in Sources */,
- 2BDF4B1A166D5B690054E77F /* setup_visual.cpp in Sources */,
- 2BDF4B1C166D5B690054E77F /* shopwindow.cpp in Sources */,
- 2BDF4B1E166D5B690054E77F /* shortcutwindow.cpp in Sources */,
- 2BDF4B20166D5B690054E77F /* skilldialog.cpp in Sources */,
- 2BDF4B22166D5B690054E77F /* socialwindow.cpp in Sources */,
- 2BDF4B26166D5B690054E77F /* speechbubble.cpp in Sources */,
- 2BDF4B28166D5B690054E77F /* spellpopup.cpp in Sources */,
- 2BDF4B2A166D5B690054E77F /* statuspopup.cpp in Sources */,
- 2BDF4B2C166D5B690054E77F /* statuswindow.cpp in Sources */,
- 2BDF4B2E166D5B690054E77F /* textcommandeditor.cpp in Sources */,
- 2BDF4B30166D5B690054E77F /* textdialog.cpp in Sources */,
- 2BDF4B32166D5B690054E77F /* textpopup.cpp in Sources */,
+ 2B1217E41827120D006F8EED /* inputmanager.cpp in Sources */,
+ 2B1217D61827120D006F8EED /* actorsprite.cpp in Sources */,
+ 2B1217F81827120D006F8EED /* rotationalparticle.cpp in Sources */,
2BDF4B34166D5B690054E77F /* theme.cpp in Sources */,
- 2BDF4B36166D5B690054E77F /* tradewindow.cpp in Sources */,
- 2BDF4B38166D5B690054E77F /* unregisterdialog.cpp in Sources */,
- 2BDF4B3A166D5B690054E77F /* updaterwindow.cpp in Sources */,
2BDF4B3C166D5B690054E77F /* userpalette.cpp in Sources */,
2BDF4B3E166D5B690054E77F /* viewport.cpp in Sources */,
- 2BDF4B40166D5B690054E77F /* whoisonline.cpp in Sources */,
+ 2B72F37B1827175B003A9FB7 /* tradetab.cpp in Sources */,
2BDF4B42166D5B690054E77F /* avatarlistbox.cpp in Sources */,
- 2BDF4B44166D5B690054E77F /* battletab.cpp in Sources */,
+ 2B72F29418271656003A9FB7 /* emotewindow.cpp in Sources */,
+ 2B72F28C18271656003A9FB7 /* debugwindow.cpp in Sources */,
2BDF4B46166D5B690054E77F /* browserbox.cpp in Sources */,
2BDF4B4A166D5B690054E77F /* button.cpp in Sources */,
- 2BDF4B4E166D5B690054E77F /* chattab.cpp in Sources */,
2BDF4B50166D5B690054E77F /* checkbox.cpp in Sources */,
2BDF4B52166D5B690054E77F /* container.cpp in Sources */,
+ 2B1218041827120D006F8EED /* renderers.cpp in Sources */,
+ 2B72F28218271656003A9FB7 /* charcreatedialog.cpp in Sources */,
2BDF4B54166D5B690054E77F /* desktop.cpp in Sources */,
+ 2B72F2EB182716F1003A9FB7 /* multitouchmanager.cpp in Sources */,
+ 2B72F26C18271656003A9FB7 /* itempopup.cpp in Sources */,
2BDF4B56166D5B690054E77F /* dropdown.cpp in Sources */,
2BDF4B58166D5B690054E77F /* dropshortcutcontainer.cpp in Sources */,
+ 2B121835182712DC006F8EED /* beingcommon.cpp in Sources */,
2BDF4B5A166D5B690054E77F /* emoteshortcutcontainer.cpp in Sources */,
+ 2B121822182712A6006F8EED /* physfscheckutils.cpp in Sources */,
+ 2B72F2DE182716C1003A9FB7 /* itemsoundmanager.cpp in Sources */,
2BDF4B5C166D5B690054E77F /* extendedlistbox.cpp in Sources */,
2BDF4B5E166D5B690054E77F /* extendednamesmodel.cpp in Sources */,
+ 2B72F2B218271656003A9FB7 /* registerdialog.cpp in Sources */,
+ 2B1217D81827120D006F8EED /* being.cpp in Sources */,
+ 2B72F27618271656003A9FB7 /* textpopup.cpp in Sources */,
2BDF4B60166D5B690054E77F /* flowcontainer.cpp in Sources */,
- 2BDF4B62166D5B690054E77F /* guildchattab.cpp in Sources */,
+ 2B72F3531827175B003A9FB7 /* chattab.cpp in Sources */,
+ 2B12180A1827120D006F8EED /* sdl2softwaregraphics.cpp in Sources */,
2BDF4B64166D5B690054E77F /* guitable.cpp in Sources */,
2BDF4B66166D5B690054E77F /* horizontcontainer.cpp in Sources */,
2BDF4B68166D5B690054E77F /* icon.cpp in Sources */,
+ 2B72F27C18271656003A9FB7 /* buyselldialog.cpp in Sources */,
2BDF4B6A166D5B690054E77F /* inttextfield.cpp in Sources */,
2BDF4B6C166D5B690054E77F /* itemcontainer.cpp in Sources */,
+ 2B9A1A51188F3DAD005F72F1 /* pethandler.cpp in Sources */,
+ 2B72F3671827175B003A9FB7 /* setup_perfomance.cpp in Sources */,
2BDF4B6E166D5B690054E77F /* itemlinkhandler.cpp in Sources */,
2BDF4B70166D5B690054E77F /* itemshortcutcontainer.cpp in Sources */,
2BDF4B72166D5B690054E77F /* label.cpp in Sources */,
@@ -3893,97 +4045,117 @@
2BDF4B76166D5B690054E77F /* layouthelper.cpp in Sources */,
2BDF4B78166D5B690054E77F /* listbox.cpp in Sources */,
2BDF4B7A166D5B690054E77F /* namesmodel.cpp in Sources */,
+ 2B72F31418271727003A9FB7 /* monsterdb.cpp in Sources */,
2BDF4B7C166D5B690054E77F /* passwordfield.cpp in Sources */,
+ 2B72F2A218271656003A9FB7 /* minimap.cpp in Sources */,
+ 2B72F30A18271727003A9FB7 /* colordb.cpp in Sources */,
2BDF4B7E166D5B690054E77F /* playerbox.cpp in Sources */,
2BDF4B80166D5B690054E77F /* popup.cpp in Sources */,
2BDF4B82166D5B690054E77F /* progressbar.cpp in Sources */,
2BDF4B84166D5B690054E77F /* progressindicator.cpp in Sources */,
2BDF4B86166D5B690054E77F /* radiobutton.cpp in Sources */,
2BDF4B88166D5B690054E77F /* radiogroup.cpp in Sources */,
+ 2B72F29A18271656003A9FB7 /* inventorywindow.cpp in Sources */,
+ 2B72F2B018271656003A9FB7 /* quitdialog.cpp in Sources */,
2BDF4B8A166D5B690054E77F /* scrollarea.cpp in Sources */,
+ 2B72F30C18271727003A9FB7 /* deaddb.cpp in Sources */,
2BDF4B8C166D5B690054E77F /* setupitem.cpp in Sources */,
- 2BDF4B8E166D5B690054E77F /* setuptab.cpp in Sources */,
- 2BDF4B90166D5B690054E77F /* setuptabscroll.cpp in Sources */,
+ 2B1218001827120D006F8EED /* normalopenglgraphics.cpp in Sources */,
2BDF4B92166D5B690054E77F /* shopitems.cpp in Sources */,
+ 2B72F27818271656003A9FB7 /* botcheckerwindow.cpp in Sources */,
2BDF4B94166D5B690054E77F /* shoplistbox.cpp in Sources */,
2BDF4B96166D5B690054E77F /* shortcutcontainer.cpp in Sources */,
2BDF4B98166D5B690054E77F /* slider.cpp in Sources */,
+ 2B72F3571827175B003A9FB7 /* guildchattab.cpp in Sources */,
2BDF4B9A166D5B690054E77F /* sliderlist.cpp in Sources */,
2BDF4B9C166D5B690054E77F /* spellshortcutcontainer.cpp in Sources */,
- 2BDF4B9E166D5B690054E77F /* tab.cpp in Sources */,
2BDF4BA0166D5B690054E77F /* tabbedarea.cpp in Sources */,
2BDF4BA2166D5B690054E77F /* tablemodel.cpp in Sources */,
2BDF4BA4166D5B690054E77F /* tabstrip.cpp in Sources */,
2BDF4BA6166D5B690054E77F /* textbox.cpp in Sources */,
2BDF4BA8166D5B690054E77F /* textfield.cpp in Sources */,
+ 2B1217E01827120D006F8EED /* playerrelations.cpp in Sources */,
2BDF4BAA166D5B690054E77F /* textpreview.cpp in Sources */,
- 2BDF4BAC166D5B690054E77F /* tradetab.cpp in Sources */,
2BDF4BAE166D5B690054E77F /* vertcontainer.cpp in Sources */,
- 2BDF4BB0166D5B690054E77F /* whispertab.cpp in Sources */,
2BDF4BB2166D5B690054E77F /* widgetgroup.cpp in Sources */,
+ 2B12178B182711F8006F8EED /* mapheights.cpp in Sources */,
2BDF4BB4166D5B690054E77F /* window.cpp in Sources */,
+ 2B72F3511827175B003A9FB7 /* battletab.cpp in Sources */,
2BDF4BB6166D5B690054E77F /* windowcontainer.cpp in Sources */,
2BDF4BB8166D5B690054E77F /* windowmenu.cpp in Sources */,
- 2BDF4BBA166D5B690054E77F /* worldselectdialog.cpp in Sources */,
+ 2B9A1A48188F3D40005F72F1 /* setup_mods.cpp in Sources */,
2BDF4BBC166D5B690054E77F /* actionevent.cpp in Sources */,
2BDF4BBE166D5B690054E77F /* basiccontainer.cpp in Sources */,
+ 2B72F28E18271656003A9FB7 /* didyouknowwindow.cpp in Sources */,
2BDF4BC0166D5B690054E77F /* cliprectangle.cpp in Sources */,
2BDF4BC2166D5B690054E77F /* color.cpp in Sources */,
2BDF4BC4166D5B690054E77F /* event.cpp in Sources */,
2BDF4BC6166D5B690054E77F /* exception.cpp in Sources */,
2BDF4BC8166D5B690054E77F /* focushandler.cpp in Sources */,
+ 2B1217DC1827120D006F8EED /* localplayer.cpp in Sources */,
+ 2B72F28818271656003A9FB7 /* confirmdialog.cpp in Sources */,
2BDF4BCA166D5B690054E77F /* font.cpp in Sources */,
2BDF4BCC166D5B690054E77F /* graphics.cpp in Sources */,
2BDF4BCE166D5B690054E77F /* gui.cpp in Sources */,
2BDF4BD0166D5B690054E77F /* image.cpp in Sources */,
+ 2B12184B1827137F006F8EED /* colormodel.cpp in Sources */,
2BDF4BD2166D5B690054E77F /* inputevent.cpp in Sources */,
2BDF4BD4166D5B690054E77F /* key.cpp in Sources */,
+ 2B72F2A418271656003A9FB7 /* ministatuswindow.cpp in Sources */,
2BDF4BD6166D5B690054E77F /* keyevent.cpp in Sources */,
2BDF4BD8166D5B690054E77F /* keyinput.cpp in Sources */,
+ 2B72F37D1827175B003A9FB7 /* whispertab.cpp in Sources */,
2BDF4BDA166D5B690054E77F /* mouseevent.cpp in Sources */,
2BDF4BDC166D5B690054E77F /* mouseinput.cpp in Sources */,
2BDF4BDE166D5B690054E77F /* rectangle.cpp in Sources */,
- 2BDF4BE0166D5B690054E77F /* sdlgraphics.cpp in Sources */,
2BDF4BE2166D5B690054E77F /* selectionevent.cpp in Sources */,
2BDF4BE4166D5B690054E77F /* widget.cpp in Sources */,
2BDF4BE6166D5B690054E77F /* button.cpp in Sources */,
+ 2B72F2A018271656003A9FB7 /* logindialog.cpp in Sources */,
+ 2B72F27418271656003A9FB7 /* statuspopup.cpp in Sources */,
2BDF4BE8166D5B690054E77F /* checkbox.cpp in Sources */,
+ 2B9A1A5E188F3EE4005F72F1 /* moddb.cpp in Sources */,
2BDF4BEA166D5B690054E77F /* container.cpp in Sources */,
2BDF4BEE166D5B690054E77F /* label.cpp in Sources */,
+ 2B72F28018271656003A9FB7 /* changepassworddialog.cpp in Sources */,
2BDF4BF0166D5B690054E77F /* listbox.cpp in Sources */,
2BDF4BF2166D5B690054E77F /* radiobutton.cpp in Sources */,
2BDF4BF4166D5B690054E77F /* scrollarea.cpp in Sources */,
+ 2B72F2CC18271656003A9FB7 /* updaterwindow.cpp in Sources */,
+ 2B121820182712A6006F8EED /* sdlhelper.cpp in Sources */,
+ 2B72F2C218271656003A9FB7 /* statuswindow.cpp in Sources */,
2BDF4BF6166D5B690054E77F /* slider.cpp in Sources */,
2BDF4BF8166D5B690054E77F /* textbox.cpp in Sources */,
2BDF4BFA166D5B690054E77F /* textfield.cpp in Sources */,
+ 2B1217F41827120D006F8EED /* particlecontainer.cpp in Sources */,
+ 2B72F3791827175B003A9FB7 /* tab.cpp in Sources */,
2BDF4BFC166D5B690054E77F /* window.cpp in Sources */,
2BDF4BFE166D5B690054E77F /* guild.cpp in Sources */,
2BDF4C00166D5B690054E77F /* guildmanager.cpp in Sources */,
- 2BDF4C02166D5B690054E77F /* imageparticle.cpp in Sources */,
2BDF4C04166D5B690054E77F /* imagesprite.cpp in Sources */,
- 2BDF4C06166D5B690054E77F /* inputevent.cpp in Sources */,
- 2BDF4C08166D5B690054E77F /* inputmanager.cpp in Sources */,
+ 2B72F28618271656003A9FB7 /* chatwindow.cpp in Sources */,
2BDF4C0A166D5B690054E77F /* inventory.cpp in Sources */,
2BDF4C0C166D5B690054E77F /* item.cpp in Sources */,
2BDF4C0E166D5B690054E77F /* itemshortcut.cpp in Sources */,
- 2BDF4C10166D5B690054E77F /* joystick.cpp in Sources */,
- 2BDF4C12166D5B690054E77F /* keyboardconfig.cpp in Sources */,
- 2BDF4C14166D5B690054E77F /* keyevent.cpp in Sources */,
- 2BDF4C16166D5B690054E77F /* keyinput.cpp in Sources */,
- 2BDF4C1A166D5B690054E77F /* localplayer.cpp in Sources */,
+ 2B72F2DA182716C1003A9FB7 /* actormanager.cpp in Sources */,
+ 2B72F35D1827175B003A9FB7 /* setup_chat.cpp in Sources */,
2BDF4C1C166D5B690054E77F /* logger.cpp in Sources */,
2BDF4C1E166D5B690054E77F /* main.cpp in Sources */,
2BDF4C20166D5B690054E77F /* map.cpp in Sources */,
+ 2B72F2C418271656003A9FB7 /* textcommandeditor.cpp in Sources */,
+ 2B12181C182712A6006F8EED /* files.cpp in Sources */,
2BDF4C22166D5B690054E77F /* maplayer.cpp in Sources */,
- 2BDF4C24166D5B690054E77F /* mgl.cpp in Sources */,
- 2BDF4C26166D5B690054E77F /* mobileopenglgraphics.cpp in Sources */,
2BDF4C28166D5B690054E77F /* mouseinput.cpp in Sources */,
2BDF4C2A166D5B690054E77F /* mumblemanager.cpp in Sources */,
2BDF4C2E166D5B690054E77F /* download.cpp in Sources */,
+ 2B72F35F1827175B003A9FB7 /* setup_colors.cpp in Sources */,
2BDF4C30166D5B690054E77F /* adminhandler.cpp in Sources */,
+ 2B121824182712A6006F8EED /* sdl2helper.cpp in Sources */,
2BDF4C32166D5B690054E77F /* beinghandler.cpp in Sources */,
2BDF4C34166D5B690054E77F /* buysellhandler.cpp in Sources */,
+ 2B72F28418271656003A9FB7 /* charselectdialog.cpp in Sources */,
2BDF4C36166D5B690054E77F /* charserverhandler.cpp in Sources */,
+ 2B72F29018271656003A9FB7 /* editdialog.cpp in Sources */,
2BDF4C38166D5B690054E77F /* chathandler.cpp in Sources */,
2BDF4C3A166D5B690054E77F /* gamehandler.cpp in Sources */,
2BDF4C3C166D5B690054E77F /* guildtab.cpp in Sources */,
@@ -3991,19 +4163,25 @@
2BDF4C40166D5B690054E77F /* guildhandler.cpp in Sources */,
2BDF4C42166D5B690054E77F /* inventoryhandler.cpp in Sources */,
2BDF4C44166D5B690054E77F /* itemhandler.cpp in Sources */,
+ 2B72F27E18271656003A9FB7 /* changeemaildialog.cpp in Sources */,
2BDF4C46166D5B690054E77F /* loginhandler.cpp in Sources */,
2BDF4C48166D5B690054E77F /* network.cpp in Sources */,
2BDF4C4A166D5B690054E77F /* npchandler.cpp in Sources */,
2BDF4C4C166D5B690054E77F /* partyhandler.cpp in Sources */,
2BDF4C4E166D5B690054E77F /* playerhandler.cpp in Sources */,
+ 2B72F2BA18271656003A9FB7 /* shopwindow.cpp in Sources */,
2BDF4C52166D5B690054E77F /* tradehandler.cpp in Sources */,
2BDF4C54166D5B690054E77F /* adminhandler.cpp in Sources */,
+ 2B1218021827120D006F8EED /* nullopenglgraphics.cpp in Sources */,
2BDF4C56166D5B690054E77F /* beinghandler.cpp in Sources */,
2BDF4C58166D5B690054E77F /* buysellhandler.cpp in Sources */,
+ 2B72F3551827175B003A9FB7 /* gmtab.cpp in Sources */,
2BDF4C5A166D5B690054E77F /* charserverhandler.cpp in Sources */,
2BDF4C5C166D5B690054E77F /* chathandler.cpp in Sources */,
+ 2B72F2B818271656003A9FB7 /* setup.cpp in Sources */,
2BDF4C5E166D5B690054E77F /* gamehandler.cpp in Sources */,
2BDF4C60166D5B690054E77F /* generalhandler.cpp in Sources */,
+ 2B1217FC1827120D006F8EED /* graphics.cpp in Sources */,
2BDF4C62166D5B690054E77F /* guildtab.cpp in Sources */,
2BDF4C64166D5B690054E77F /* partytab.cpp in Sources */,
2BDF4C66166D5B690054E77F /* guildhandler.cpp in Sources */,
@@ -4012,80 +4190,104 @@
2BDF4C6C166D5B690054E77F /* loginhandler.cpp in Sources */,
2BDF4C6E166D5B690054E77F /* messagehandler.cpp in Sources */,
2BDF4C70166D5B690054E77F /* messagein.cpp in Sources */,
+ 2B72F3631827175B003A9FB7 /* setup_joystick.cpp in Sources */,
2BDF4C72166D5B690054E77F /* messageout.cpp in Sources */,
2BDF4C74166D5B690054E77F /* network.cpp in Sources */,
+ 2B72F36D1827175B003A9FB7 /* setup_theme.cpp in Sources */,
2BDF4C76166D5B690054E77F /* npchandler.cpp in Sources */,
2BDF4C78166D5B690054E77F /* partyhandler.cpp in Sources */,
+ 2B72F2BE18271656003A9FB7 /* skilldialog.cpp in Sources */,
2BDF4C7A166D5B690054E77F /* playerhandler.cpp in Sources */,
2BDF4C7E166D5B690054E77F /* tradehandler.cpp in Sources */,
2BDF4C80166D5B690054E77F /* messagein.cpp in Sources */,
+ 2B72F3651827175B003A9FB7 /* setup_other.cpp in Sources */,
+ 2B1217FA1827120D006F8EED /* textparticle.cpp in Sources */,
2BDF4C82166D5B690054E77F /* messageout.cpp in Sources */,
2BDF4C84166D5B690054E77F /* net.cpp in Sources */,
2BDF4C86166D5B690054E77F /* packetcounters.cpp in Sources */,
2BDF4C88166D5B690054E77F /* adminhandler.cpp in Sources */,
+ 2B72F31C18271727003A9FB7 /* sounddb.cpp in Sources */,
2BDF4C8A166D5B690054E77F /* beinghandler.cpp in Sources */,
2BDF4C8C166D5B690054E77F /* buysellhandler.cpp in Sources */,
2BDF4C8E166D5B690054E77F /* charserverhandler.cpp in Sources */,
+ 2B72F3591827175B003A9FB7 /* langtab.cpp in Sources */,
+ 2B72F2CA18271656003A9FB7 /* unregisterdialog.cpp in Sources */,
+ 2B1217D41827120D006F8EED /* actor.cpp in Sources */,
2BDF4C90166D5B690054E77F /* chathandler.cpp in Sources */,
+ 2B72F30618271727003A9FB7 /* avatardb.cpp in Sources */,
2BDF4C92166D5B690054E77F /* gamehandler.cpp in Sources */,
+ 2B121839182712DC006F8EED /* sdl2softwareimagehelper.cpp in Sources */,
2BDF4C94166D5B690054E77F /* generalhandler.cpp in Sources */,
2BDF4C96166D5B690054E77F /* guildtab.cpp in Sources */,
+ 2B72F3201827173C003A9FB7 /* mgl.cpp in Sources */,
2BDF4C98166D5B690054E77F /* partytab.cpp in Sources */,
+ 2B72F3771827175B003A9FB7 /* setuptabscroll.cpp in Sources */,
2BDF4C9A166D5B690054E77F /* guildhandler.cpp in Sources */,
+ 2B72F31218271727003A9FB7 /* mapdb.cpp in Sources */,
2BDF4C9C166D5B690054E77F /* inventoryhandler.cpp in Sources */,
2BDF4C9E166D5B690054E77F /* itemhandler.cpp in Sources */,
2BDF4CA0166D5B690054E77F /* loginhandler.cpp in Sources */,
+ 2B1217E21827120D006F8EED /* inputevent.cpp in Sources */,
2BDF4CA2166D5B690054E77F /* messagehandler.cpp in Sources */,
+ 2B1217EE1827120D006F8EED /* animationparticle.cpp in Sources */,
2BDF4CA4166D5B690054E77F /* messagein.cpp in Sources */,
+ 2B1217DA1827120D006F8EED /* compoundsprite.cpp in Sources */,
2BDF4CA6166D5B690054E77F /* messageout.cpp in Sources */,
2BDF4CA8166D5B690054E77F /* network.cpp in Sources */,
+ 2B1217E61827120D006F8EED /* joystick.cpp in Sources */,
2BDF4CAA166D5B690054E77F /* npchandler.cpp in Sources */,
+ 2B72F2C818271656003A9FB7 /* tradewindow.cpp in Sources */,
2BDF4CAC166D5B690054E77F /* partyhandler.cpp in Sources */,
2BDF4CAE166D5B690054E77F /* playerhandler.cpp in Sources */,
+ 2B1218081827120D006F8EED /* sdl2graphics.cpp in Sources */,
+ 2B72F2D018271656003A9FB7 /* worldselectdialog.cpp in Sources */,
+ 2B9A1A56188F3DE6005F72F1 /* timer.cpp in Sources */,
2BDF4CB0166D5B690054E77F /* questhandler.cpp in Sources */,
2BDF4CB4166D5B690054E77F /* tradehandler.cpp in Sources */,
- 2BDF4CB6166D5B690054E77F /* normalopenglgraphics.cpp in Sources */,
- 2BDF4CB8166D5B690054E77F /* particle.cpp in Sources */,
- 2BDF4CBA166D5B690054E77F /* particlecontainer.cpp in Sources */,
- 2BDF4CBC166D5B690054E77F /* particleemitter.cpp in Sources */,
2BDF4CBE166D5B690054E77F /* party.cpp in Sources */,
- 2BDF4CC0166D5B690054E77F /* playerinfo.cpp in Sources */,
- 2BDF4CC2166D5B690054E77F /* playerrelations.cpp in Sources */,
+ 2B121826182712A6006F8EED /* fuzzer.cpp in Sources */,
2BDF4CC4166D5B690054E77F /* position.cpp in Sources */,
2BDF4CC6166D5B690054E77F /* action.cpp in Sources */,
+ 2B72F2CE18271656003A9FB7 /* whoisonline.cpp in Sources */,
+ 2B72F29618271656003A9FB7 /* equipmentwindow.cpp in Sources */,
+ 2B72F36F1827175B003A9FB7 /* setup_touch.cpp in Sources */,
2BDF4CC8166D5B690054E77F /* ambientlayer.cpp in Sources */,
2BDF4CCA166D5B690054E77F /* animation.cpp in Sources */,
+ 2B72F2DC182716C1003A9FB7 /* eventsmanager.cpp in Sources */,
2BDF4CCC166D5B690054E77F /* atlasmanager.cpp in Sources */,
2BDF4CCE166D5B690054E77F /* beinginfo.cpp in Sources */,
- 2BDF4CD0166D5B690054E77F /* chardb.cpp in Sources */,
- 2BDF4CD2166D5B690054E77F /* colordb.cpp in Sources */,
+ 2B1217F61827120D006F8EED /* particleemitter.cpp in Sources */,
2BDF4CD4166D5B690054E77F /* cursor.cpp in Sources */,
+ 2B72F26A18271656003A9FB7 /* beingpopup.cpp in Sources */,
+ 2B72F2C018271656003A9FB7 /* socialwindow.cpp in Sources */,
2BDF4CD6166D5B690054E77F /* dye.cpp in Sources */,
- 2BDF4CD8166D5B690054E77F /* emotedb.cpp in Sources */,
+ 2B72F2B618271656003A9FB7 /* serverdialog.cpp in Sources */,
2BDF4CDA166D5B690054E77F /* image.cpp in Sources */,
+ 2B1217F21827120D006F8EED /* particle.cpp in Sources */,
2BDF4CDC166D5B690054E77F /* imagehelper.cpp in Sources */,
2BDF4CDE166D5B690054E77F /* imageset.cpp in Sources */,
2BDF4CE0166D5B690054E77F /* imagewriter.cpp in Sources */,
- 2BDF4CE2166D5B690054E77F /* itemdb.cpp in Sources */,
+ 2B1217EA1827120D006F8EED /* keyevent.cpp in Sources */,
2BDF4CE4166D5B690054E77F /* iteminfo.cpp in Sources */,
- 2BDF4CE6166D5B690054E77F /* mapdb.cpp in Sources */,
2BDF4CE8166D5B690054E77F /* mapreader.cpp in Sources */,
- 2BDF4CEA166D5B690054E77F /* monsterdb.cpp in Sources */,
- 2BDF4CEC166D5B690054E77F /* npcdb.cpp in Sources */,
+ 2B72F2AE18271656003A9FB7 /* questswindow.cpp in Sources */,
2BDF4CEE166D5B690054E77F /* openglimagehelper.cpp in Sources */,
2BDF4CF0166D5B690054E77F /* resource.cpp in Sources */,
+ 2B72F2B418271656003A9FB7 /* selldialog.cpp in Sources */,
2BDF4CF2166D5B690054E77F /* resourcemanager.cpp in Sources */,
+ 2B72F28A18271656003A9FB7 /* connectiondialog.cpp in Sources */,
+ 2B121837182712DC006F8EED /* sdl2imagehelper.cpp in Sources */,
2BDF4CF4166D5B690054E77F /* sdlimagehelper.cpp in Sources */,
+ 2B72F2A618271656003A9FB7 /* npcdialog.cpp in Sources */,
2BDF4CF6166D5B690054E77F /* sdlmusic.cpp in Sources */,
2BDF4CF8166D5B690054E77F /* soundeffect.cpp in Sources */,
2BDF4CFC166D5B690054E77F /* spritedef.cpp in Sources */,
2BDF4CFE166D5B690054E77F /* subimage.cpp in Sources */,
2BDF4D00166D5B690054E77F /* wallpaper.cpp in Sources */,
- 2BDF4D02166D5B690054E77F /* rotationalparticle.cpp in Sources */,
- 2BDF4D04166D5B690054E77F /* safeopenglgraphics.cpp in Sources */,
2BDF4D06166D5B690054E77F /* SDLMain.m in Sources */,
2BDF4D08166D5B690054E77F /* shopitem.cpp in Sources */,
2BDF4D0A166D5B690054E77F /* simpleanimation.cpp in Sources */,
+ 2B72F29818271656003A9FB7 /* helpwindow.cpp in Sources */,
2BDF4D0C166D5B690054E77F /* soundmanager.cpp in Sources */,
2BDF4D0E166D5B690054E77F /* spellmanager.cpp in Sources */,
2BDF4D10166D5B690054E77F /* spellshortcut.cpp in Sources */,
@@ -4093,19 +4295,23 @@
2BDF4D14166D5B690054E77F /* testlauncher.cpp in Sources */,
2BDF4D16166D5B690054E77F /* testmain.cpp in Sources */,
2BDF4D18166D5B690054E77F /* text.cpp in Sources */,
+ 2B72F31618271727003A9FB7 /* npcdb.cpp in Sources */,
2BDF4D1A166D5B690054E77F /* textcommand.cpp in Sources */,
2BDF4D1C166D5B690054E77F /* textmanager.cpp in Sources */,
- 2BDF4D1E166D5B690054E77F /* textparticle.cpp in Sources */,
2BDF4D20166D5B690054E77F /* touchactions.cpp in Sources */,
2BDF4D22166D5B690054E77F /* touchmanager.cpp in Sources */,
2BDF4D24166D5B690054E77F /* units.cpp in Sources */,
2BDF4D26166D5B690054E77F /* base64.cpp in Sources */,
2BDF4D28166D5B690054E77F /* checkutils.cpp in Sources */,
+ 2B72F31A18271727003A9FB7 /* petdb.cpp in Sources */,
2BDF4D2A166D5B690054E77F /* copynpaste.cpp in Sources */,
+ 2B72F27218271656003A9FB7 /* spellpopup.cpp in Sources */,
2BDF4D2C166D5B690054E77F /* langs.cpp in Sources */,
2BDF4D2E166D5B690054E77F /* mkdir.cpp in Sources */,
2BDF4D30166D5B690054E77F /* paths.cpp in Sources */,
2BDF4D32166D5B690054E77F /* perfomance.cpp in Sources */,
+ 2B12181E182712A6006F8EED /* sdlcheckutils.cpp in Sources */,
+ 2B9A1A5A188F3EC6005F72F1 /* modinfo.cpp in Sources */,
2BDF4D34166D5B690054E77F /* physfsrwops.cpp in Sources */,
2BDF4D36166D5B690054E77F /* process.cpp in Sources */,
2BDF4D3A166D5B690054E77F /* specialfolder.cpp in Sources */,
@@ -4113,31 +4319,34 @@
2BDF4D40166D5B690054E77F /* podict.cpp in Sources */,
2BDF4D42166D5B690054E77F /* poparser.cpp in Sources */,
2BDF4D44166D5B690054E77F /* translationmanager.cpp in Sources */,
+ 2B72F2AC18271656003A9FB7 /* outfitwindow.cpp in Sources */,
+ 2B1218061827120D006F8EED /* safeopenglgraphics.cpp in Sources */,
2BDF4D46166D5B690054E77F /* xml.cpp in Sources */,
2BDF4D48166D5B690054E77F /* vector.cpp in Sources */,
2B8B70CB167EBCB3003A8440 /* popuplist.cpp in Sources */,
- 2B8B70CE167EBE3A003A8440 /* setup_touch.cpp in Sources */,
2B43647A16AB8BE40034DAC2 /* setuptouchitem.cpp in Sources */,
2B7A5E5D16D82A3E0020A1C1 /* physfstools.cpp in Sources */,
- 2B7A5E6116D82C010020A1C1 /* gmtab.cpp in Sources */,
+ 2B72F27018271656003A9FB7 /* speechbubble.cpp in Sources */,
+ 2B72F2AA18271656003A9FB7 /* okdialog.cpp in Sources */,
2BFB6E3016E2AE69007EE3A6 /* skillhandler.cpp in Sources */,
2BFB6E3516E2AE99007EE3A6 /* skillhandler.cpp in Sources */,
2BFB6E3916E2AEB9007EE3A6 /* skillhandler.cpp in Sources */,
2B65B45716EFC75D00AAD717 /* notifymanager.cpp in Sources */,
- 2B1E2212172AF91A00B7230A /* sounddb.cpp in Sources */,
+ 2B1217F01827120D006F8EED /* imageparticle.cpp in Sources */,
2B1E2218172AF96000B7230A /* auctionmanager.cpp in Sources */,
+ 2B1217E81827120D006F8EED /* keyboardconfig.cpp in Sources */,
+ 2B72F31018271727003A9FB7 /* itemdb.cpp in Sources */,
+ 2B72F29C18271656003A9FB7 /* itemamountwindow.cpp in Sources */,
2B1E221A172AF96000B7230A /* walklayer.cpp in Sources */,
- 2B1E221E172AF9E800B7230A /* langtab.cpp in Sources */,
+ 2B72F29218271656003A9FB7 /* editserverdialog.cpp in Sources */,
2B1E2222172AFA2100B7230A /* navigationmanager.cpp in Sources */,
- 2B1E2226172AFBB500B7230A /* petdb.cpp in Sources */,
2B1E222C172AFC4C00B7230A /* charserverhandler.cpp in Sources */,
2B1E222E172AFC4C00B7230A /* sdltcpnet.cpp in Sources */,
- 2BB28FB2172B43860046599B /* palettedb.cpp in Sources */,
- 2BB28FB6172B4CEF0046599B /* nullopenglgraphics.cpp in Sources */,
+ 2B72F26E18271656003A9FB7 /* popupmenu.cpp in Sources */,
2B6B0E51176BDD3000930985 /* cpu.cpp in Sources */,
- 2B6B0E56176BDD7B00930985 /* avatardb.cpp in Sources */,
2B6B0E5E176BDDC100930985 /* skilldata.cpp in Sources */,
2B6B0E60176BDDC100930985 /* skillinfo.cpp in Sources */,
+ 2B72F35B1827175B003A9FB7 /* setup_audio.cpp in Sources */,
2B6B0E62176BDDC100930985 /* skillmodel.cpp in Sources */,
2B6B0E66176BDDE100930985 /* depricatedlistener.cpp in Sources */,
2B6B0E6B176BDE0400930985 /* beingequipbackend.cpp in Sources */,
@@ -4153,19 +4362,13 @@
files = (
2BDF45EE166D5AEC0054E77F /* ManaPlusTests.m in Sources */,
2BDF4A77166D5B690054E77F /* actionmanager.cpp in Sources */,
- 2BDF4A79166D5B690054E77F /* actor.cpp in Sources */,
- 2BDF4A7B166D5B690054E77F /* actorsprite.cpp in Sources */,
- 2BDF4A7D166D5B690054E77F /* actorspritemanager.cpp in Sources */,
2BDF4A7F166D5B690054E77F /* animatedsprite.cpp in Sources */,
2BDF4A81166D5B690054E77F /* animationdelayload.cpp in Sources */,
- 2BDF4A83166D5B690054E77F /* animationparticle.cpp in Sources */,
2BDF4A87166D5B690054E77F /* avatar.cpp in Sources */,
- 2BDF4A89166D5B690054E77F /* being.cpp in Sources */,
2BDF4A8F166D5B690054E77F /* chatlogger.cpp in Sources */,
2BDF4A91166D5B690054E77F /* client.cpp in Sources */,
2BDF4A93166D5B690054E77F /* commandhandler.cpp in Sources */,
2BDF4A95166D5B690054E77F /* commands.cpp in Sources */,
- 2BDF4A97166D5B690054E77F /* compoundsprite.cpp in Sources */,
2BDF4A99166D5B690054E77F /* configuration.cpp in Sources */,
2BDF4A9B166D5B690054E77F /* debug_new.cpp in Sources */,
2BDF4A9D166D5B690054E77F /* defaults.cpp in Sources */,
@@ -4175,84 +4378,19 @@
2BDF4AA5166D5B690054E77F /* emoteshortcut.cpp in Sources */,
2BDF4AAB166D5B690054E77F /* flooritem.cpp in Sources */,
2BDF4AAD166D5B690054E77F /* game.cpp in Sources */,
- 2BDF4AAF166D5B690054E77F /* graphics.cpp in Sources */,
2BDF4AB1166D5B690054E77F /* graphicsmanager.cpp in Sources */,
2BDF4AB3166D5B690054E77F /* graphicsvertexes.cpp in Sources */,
- 2BDF4AB5166D5B690054E77F /* beingpopup.cpp in Sources */,
- 2BDF4AB7166D5B690054E77F /* botcheckerwindow.cpp in Sources */,
- 2BDF4AB9166D5B690054E77F /* buydialog.cpp in Sources */,
- 2BDF4ABB166D5B690054E77F /* buyselldialog.cpp in Sources */,
- 2BDF4ABD166D5B690054E77F /* changeemaildialog.cpp in Sources */,
- 2BDF4ABF166D5B690054E77F /* changepassworddialog.cpp in Sources */,
- 2BDF4AC1166D5B690054E77F /* charcreatedialog.cpp in Sources */,
- 2BDF4AC3166D5B690054E77F /* charselectdialog.cpp in Sources */,
- 2BDF4AC5166D5B690054E77F /* chatwindow.cpp in Sources */,
- 2BDF4AC7166D5B690054E77F /* confirmdialog.cpp in Sources */,
- 2BDF4AC9166D5B690054E77F /* connectiondialog.cpp in Sources */,
- 2BDF4ACB166D5B690054E77F /* debugwindow.cpp in Sources */,
- 2BDF4ACD166D5B690054E77F /* didyouknowwindow.cpp in Sources */,
- 2BDF4ACF166D5B690054E77F /* editdialog.cpp in Sources */,
- 2BDF4AD1166D5B690054E77F /* editserverdialog.cpp in Sources */,
- 2BDF4AD3166D5B690054E77F /* equipmentwindow.cpp in Sources */,
2BDF4AD5166D5B690054E77F /* focushandler.cpp in Sources */,
2BDF4AD7166D5B690054E77F /* gui.cpp in Sources */,
- 2BDF4AD9166D5B690054E77F /* helpwindow.cpp in Sources */,
- 2BDF4ADB166D5B690054E77F /* inventorywindow.cpp in Sources */,
- 2BDF4ADD166D5B690054E77F /* itemamountwindow.cpp in Sources */,
- 2BDF4ADF166D5B690054E77F /* itempopup.cpp in Sources */,
- 2BDF4AE1166D5B690054E77F /* killstats.cpp in Sources */,
- 2BDF4AE3166D5B690054E77F /* logindialog.cpp in Sources */,
- 2BDF4AE5166D5B690054E77F /* minimap.cpp in Sources */,
- 2BDF4AE7166D5B690054E77F /* ministatuswindow.cpp in Sources */,
- 2BDF4AE9166D5B690054E77F /* npcdialog.cpp in Sources */,
- 2BDF4AEB166D5B690054E77F /* npcpostdialog.cpp in Sources */,
- 2BDF4AED166D5B690054E77F /* okdialog.cpp in Sources */,
- 2BDF4AEF166D5B690054E77F /* outfitwindow.cpp in Sources */,
2BDF4AF1166D5B690054E77F /* palette.cpp in Sources */,
- 2BDF4AF3166D5B690054E77F /* popupmenu.cpp in Sources */,
- 2BDF4AF5166D5B690054E77F /* questswindow.cpp in Sources */,
- 2BDF4AF7166D5B690054E77F /* quitdialog.cpp in Sources */,
- 2BDF4AF9166D5B690054E77F /* registerdialog.cpp in Sources */,
2BDF4AFB166D5B690054E77F /* sdlfont.cpp in Sources */,
2BDF4AFD166D5B690054E77F /* sdlinput.cpp in Sources */,
- 2BDF4AFF166D5B690054E77F /* selldialog.cpp in Sources */,
- 2BDF4B01166D5B690054E77F /* serverdialog.cpp in Sources */,
- 2BDF4B03166D5B690054E77F /* setup.cpp in Sources */,
- 2BDF4B05166D5B690054E77F /* setup_audio.cpp in Sources */,
- 2BDF4B07166D5B690054E77F /* setup_chat.cpp in Sources */,
- 2BDF4B09166D5B690054E77F /* setup_colors.cpp in Sources */,
- 2BDF4B0B166D5B690054E77F /* setup_input.cpp in Sources */,
- 2BDF4B0D166D5B690054E77F /* setup_joystick.cpp in Sources */,
- 2BDF4B0F166D5B690054E77F /* setup_other.cpp in Sources */,
- 2BDF4B11166D5B690054E77F /* setup_perfomance.cpp in Sources */,
- 2BDF4B13166D5B690054E77F /* setup_players.cpp in Sources */,
- 2BDF4B15166D5B690054E77F /* setup_relations.cpp in Sources */,
- 2BDF4B17166D5B690054E77F /* setup_theme.cpp in Sources */,
- 2BDF4B19166D5B690054E77F /* setup_video.cpp in Sources */,
- 2BDF4B1B166D5B690054E77F /* setup_visual.cpp in Sources */,
- 2BDF4B1D166D5B690054E77F /* shopwindow.cpp in Sources */,
- 2BDF4B1F166D5B690054E77F /* shortcutwindow.cpp in Sources */,
- 2BDF4B21166D5B690054E77F /* skilldialog.cpp in Sources */,
- 2BDF4B23166D5B690054E77F /* socialwindow.cpp in Sources */,
- 2BDF4B27166D5B690054E77F /* speechbubble.cpp in Sources */,
- 2BDF4B29166D5B690054E77F /* spellpopup.cpp in Sources */,
- 2BDF4B2B166D5B690054E77F /* statuspopup.cpp in Sources */,
- 2BDF4B2D166D5B690054E77F /* statuswindow.cpp in Sources */,
- 2BDF4B2F166D5B690054E77F /* textcommandeditor.cpp in Sources */,
- 2BDF4B31166D5B690054E77F /* textdialog.cpp in Sources */,
- 2BDF4B33166D5B690054E77F /* textpopup.cpp in Sources */,
2BDF4B35166D5B690054E77F /* theme.cpp in Sources */,
- 2BDF4B37166D5B690054E77F /* tradewindow.cpp in Sources */,
- 2BDF4B39166D5B690054E77F /* unregisterdialog.cpp in Sources */,
- 2BDF4B3B166D5B690054E77F /* updaterwindow.cpp in Sources */,
2BDF4B3D166D5B690054E77F /* userpalette.cpp in Sources */,
2BDF4B3F166D5B690054E77F /* viewport.cpp in Sources */,
- 2BDF4B41166D5B690054E77F /* whoisonline.cpp in Sources */,
2BDF4B43166D5B690054E77F /* avatarlistbox.cpp in Sources */,
- 2BDF4B45166D5B690054E77F /* battletab.cpp in Sources */,
2BDF4B47166D5B690054E77F /* browserbox.cpp in Sources */,
2BDF4B4B166D5B690054E77F /* button.cpp in Sources */,
- 2BDF4B4F166D5B690054E77F /* chattab.cpp in Sources */,
2BDF4B51166D5B690054E77F /* checkbox.cpp in Sources */,
2BDF4B53166D5B690054E77F /* container.cpp in Sources */,
2BDF4B55166D5B690054E77F /* desktop.cpp in Sources */,
@@ -4262,7 +4400,6 @@
2BDF4B5D166D5B690054E77F /* extendedlistbox.cpp in Sources */,
2BDF4B5F166D5B690054E77F /* extendednamesmodel.cpp in Sources */,
2BDF4B61166D5B690054E77F /* flowcontainer.cpp in Sources */,
- 2BDF4B63166D5B690054E77F /* guildchattab.cpp in Sources */,
2BDF4B65166D5B690054E77F /* guitable.cpp in Sources */,
2BDF4B67166D5B690054E77F /* horizontcontainer.cpp in Sources */,
2BDF4B69166D5B690054E77F /* icon.cpp in Sources */,
@@ -4284,29 +4421,23 @@
2BDF4B89166D5B690054E77F /* radiogroup.cpp in Sources */,
2BDF4B8B166D5B690054E77F /* scrollarea.cpp in Sources */,
2BDF4B8D166D5B690054E77F /* setupitem.cpp in Sources */,
- 2BDF4B8F166D5B690054E77F /* setuptab.cpp in Sources */,
- 2BDF4B91166D5B690054E77F /* setuptabscroll.cpp in Sources */,
2BDF4B93166D5B690054E77F /* shopitems.cpp in Sources */,
2BDF4B95166D5B690054E77F /* shoplistbox.cpp in Sources */,
2BDF4B97166D5B690054E77F /* shortcutcontainer.cpp in Sources */,
2BDF4B99166D5B690054E77F /* slider.cpp in Sources */,
2BDF4B9B166D5B690054E77F /* sliderlist.cpp in Sources */,
2BDF4B9D166D5B690054E77F /* spellshortcutcontainer.cpp in Sources */,
- 2BDF4B9F166D5B690054E77F /* tab.cpp in Sources */,
2BDF4BA1166D5B690054E77F /* tabbedarea.cpp in Sources */,
2BDF4BA3166D5B690054E77F /* tablemodel.cpp in Sources */,
2BDF4BA5166D5B690054E77F /* tabstrip.cpp in Sources */,
2BDF4BA7166D5B690054E77F /* textbox.cpp in Sources */,
2BDF4BA9166D5B690054E77F /* textfield.cpp in Sources */,
2BDF4BAB166D5B690054E77F /* textpreview.cpp in Sources */,
- 2BDF4BAD166D5B690054E77F /* tradetab.cpp in Sources */,
2BDF4BAF166D5B690054E77F /* vertcontainer.cpp in Sources */,
- 2BDF4BB1166D5B690054E77F /* whispertab.cpp in Sources */,
2BDF4BB3166D5B690054E77F /* widgetgroup.cpp in Sources */,
2BDF4BB5166D5B690054E77F /* window.cpp in Sources */,
2BDF4BB7166D5B690054E77F /* windowcontainer.cpp in Sources */,
2BDF4BB9166D5B690054E77F /* windowmenu.cpp in Sources */,
- 2BDF4BBB166D5B690054E77F /* worldselectdialog.cpp in Sources */,
2BDF4BBD166D5B690054E77F /* actionevent.cpp in Sources */,
2BDF4BBF166D5B690054E77F /* basiccontainer.cpp in Sources */,
2BDF4BC1166D5B690054E77F /* cliprectangle.cpp in Sources */,
@@ -4325,7 +4456,6 @@
2BDF4BDB166D5B690054E77F /* mouseevent.cpp in Sources */,
2BDF4BDD166D5B690054E77F /* mouseinput.cpp in Sources */,
2BDF4BDF166D5B690054E77F /* rectangle.cpp in Sources */,
- 2BDF4BE1166D5B690054E77F /* sdlgraphics.cpp in Sources */,
2BDF4BE3166D5B690054E77F /* selectionevent.cpp in Sources */,
2BDF4BE5166D5B690054E77F /* widget.cpp in Sources */,
2BDF4BE7166D5B690054E77F /* button.cpp in Sources */,
@@ -4341,24 +4471,14 @@
2BDF4BFD166D5B690054E77F /* window.cpp in Sources */,
2BDF4BFF166D5B690054E77F /* guild.cpp in Sources */,
2BDF4C01166D5B690054E77F /* guildmanager.cpp in Sources */,
- 2BDF4C03166D5B690054E77F /* imageparticle.cpp in Sources */,
2BDF4C05166D5B690054E77F /* imagesprite.cpp in Sources */,
- 2BDF4C07166D5B690054E77F /* inputevent.cpp in Sources */,
- 2BDF4C09166D5B690054E77F /* inputmanager.cpp in Sources */,
2BDF4C0B166D5B690054E77F /* inventory.cpp in Sources */,
2BDF4C0D166D5B690054E77F /* item.cpp in Sources */,
2BDF4C0F166D5B690054E77F /* itemshortcut.cpp in Sources */,
- 2BDF4C11166D5B690054E77F /* joystick.cpp in Sources */,
- 2BDF4C13166D5B690054E77F /* keyboardconfig.cpp in Sources */,
- 2BDF4C15166D5B690054E77F /* keyevent.cpp in Sources */,
- 2BDF4C17166D5B690054E77F /* keyinput.cpp in Sources */,
- 2BDF4C1B166D5B690054E77F /* localplayer.cpp in Sources */,
2BDF4C1D166D5B690054E77F /* logger.cpp in Sources */,
2BDF4C1F166D5B690054E77F /* main.cpp in Sources */,
2BDF4C21166D5B690054E77F /* map.cpp in Sources */,
2BDF4C23166D5B690054E77F /* maplayer.cpp in Sources */,
- 2BDF4C25166D5B690054E77F /* mgl.cpp in Sources */,
- 2BDF4C27166D5B690054E77F /* mobileopenglgraphics.cpp in Sources */,
2BDF4C29166D5B690054E77F /* mouseinput.cpp in Sources */,
2BDF4C2B166D5B690054E77F /* mumblemanager.cpp in Sources */,
2BDF4C2F166D5B690054E77F /* download.cpp in Sources */,
@@ -4426,34 +4546,21 @@
2BDF4CAF166D5B690054E77F /* playerhandler.cpp in Sources */,
2BDF4CB1166D5B690054E77F /* questhandler.cpp in Sources */,
2BDF4CB5166D5B690054E77F /* tradehandler.cpp in Sources */,
- 2BDF4CB7166D5B690054E77F /* normalopenglgraphics.cpp in Sources */,
- 2BDF4CB9166D5B690054E77F /* particle.cpp in Sources */,
- 2BDF4CBB166D5B690054E77F /* particlecontainer.cpp in Sources */,
- 2BDF4CBD166D5B690054E77F /* particleemitter.cpp in Sources */,
2BDF4CBF166D5B690054E77F /* party.cpp in Sources */,
- 2BDF4CC1166D5B690054E77F /* playerinfo.cpp in Sources */,
- 2BDF4CC3166D5B690054E77F /* playerrelations.cpp in Sources */,
2BDF4CC5166D5B690054E77F /* position.cpp in Sources */,
2BDF4CC7166D5B690054E77F /* action.cpp in Sources */,
2BDF4CC9166D5B690054E77F /* ambientlayer.cpp in Sources */,
2BDF4CCB166D5B690054E77F /* animation.cpp in Sources */,
2BDF4CCD166D5B690054E77F /* atlasmanager.cpp in Sources */,
2BDF4CCF166D5B690054E77F /* beinginfo.cpp in Sources */,
- 2BDF4CD1166D5B690054E77F /* chardb.cpp in Sources */,
- 2BDF4CD3166D5B690054E77F /* colordb.cpp in Sources */,
2BDF4CD5166D5B690054E77F /* cursor.cpp in Sources */,
2BDF4CD7166D5B690054E77F /* dye.cpp in Sources */,
- 2BDF4CD9166D5B690054E77F /* emotedb.cpp in Sources */,
2BDF4CDB166D5B690054E77F /* image.cpp in Sources */,
2BDF4CDD166D5B690054E77F /* imagehelper.cpp in Sources */,
2BDF4CDF166D5B690054E77F /* imageset.cpp in Sources */,
2BDF4CE1166D5B690054E77F /* imagewriter.cpp in Sources */,
- 2BDF4CE3166D5B690054E77F /* itemdb.cpp in Sources */,
2BDF4CE5166D5B690054E77F /* iteminfo.cpp in Sources */,
- 2BDF4CE7166D5B690054E77F /* mapdb.cpp in Sources */,
2BDF4CE9166D5B690054E77F /* mapreader.cpp in Sources */,
- 2BDF4CEB166D5B690054E77F /* monsterdb.cpp in Sources */,
- 2BDF4CED166D5B690054E77F /* npcdb.cpp in Sources */,
2BDF4CEF166D5B690054E77F /* openglimagehelper.cpp in Sources */,
2BDF4CF1166D5B690054E77F /* resource.cpp in Sources */,
2BDF4CF3166D5B690054E77F /* resourcemanager.cpp in Sources */,
@@ -4463,8 +4570,6 @@
2BDF4CFD166D5B690054E77F /* spritedef.cpp in Sources */,
2BDF4CFF166D5B690054E77F /* subimage.cpp in Sources */,
2BDF4D01166D5B690054E77F /* wallpaper.cpp in Sources */,
- 2BDF4D03166D5B690054E77F /* rotationalparticle.cpp in Sources */,
- 2BDF4D05166D5B690054E77F /* safeopenglgraphics.cpp in Sources */,
2BDF4D07166D5B690054E77F /* SDLMain.m in Sources */,
2BDF4D09166D5B690054E77F /* shopitem.cpp in Sources */,
2BDF4D0B166D5B690054E77F /* simpleanimation.cpp in Sources */,
@@ -4477,7 +4582,6 @@
2BDF4D19166D5B690054E77F /* text.cpp in Sources */,
2BDF4D1B166D5B690054E77F /* textcommand.cpp in Sources */,
2BDF4D1D166D5B690054E77F /* textmanager.cpp in Sources */,
- 2BDF4D1F166D5B690054E77F /* textparticle.cpp in Sources */,
2BDF4D21166D5B690054E77F /* touchactions.cpp in Sources */,
2BDF4D23166D5B690054E77F /* touchmanager.cpp in Sources */,
2BDF4D25166D5B690054E77F /* units.cpp in Sources */,
diff --git a/Xcode/ManaPlus.xcodeproj/project.xcworkspace/xcshareddata/ManaPlus.xccheckout b/Xcode/ManaPlus.xcodeproj/project.xcworkspace/xcshareddata/ManaPlus.xccheckout
new file mode 100644
index 000000000..3fea39cfc
--- /dev/null
+++ b/Xcode/ManaPlus.xcodeproj/project.xcworkspace/xcshareddata/ManaPlus.xccheckout
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IDESourceControlProjectFavoriteDictionaryKey</key>
+ <false/>
+ <key>IDESourceControlProjectIdentifier</key>
+ <string>05565ECD-361A-472C-96DA-3AD3C5D5032A</string>
+ <key>IDESourceControlProjectName</key>
+ <string>ManaPlus</string>
+ <key>IDESourceControlProjectOriginsDictionary</key>
+ <dict>
+ <key>27712BCC-89D3-4B70-B17B-E454649F8AE8</key>
+ <string>https://git.gitorious.org/~socapex/manaplus/socapexs-manaplus.git</string>
+ </dict>
+ <key>IDESourceControlProjectPath</key>
+ <string>Xcode/ManaPlus.xcodeproj/project.xcworkspace</string>
+ <key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+ <dict>
+ <key>27712BCC-89D3-4B70-B17B-E454649F8AE8</key>
+ <string>../../..</string>
+ </dict>
+ <key>IDESourceControlProjectURL</key>
+ <string>https://git.gitorious.org/~socapex/manaplus/socapexs-manaplus.git</string>
+ <key>IDESourceControlProjectVersion</key>
+ <integer>110</integer>
+ <key>IDESourceControlProjectWCCIdentifier</key>
+ <string>27712BCC-89D3-4B70-B17B-E454649F8AE8</string>
+ <key>IDESourceControlProjectWCConfigurations</key>
+ <array>
+ <dict>
+ <key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+ <string>public.vcs.git</string>
+ <key>IDESourceControlWCCIdentifierKey</key>
+ <string>27712BCC-89D3-4B70-B17B-E454649F8AE8</string>
+ <key>IDESourceControlWCCName</key>
+ <string>socapexs-manaplus</string>
+ </dict>
+ </array>
+</dict>
+</plist>
diff --git a/Xcode/Release/Release10.6.dmgCanvas/Disk Image b/Xcode/Release/Release10.6.dmgCanvas/Disk Image
deleted file mode 100644
index cfcb76bb6..000000000
--- a/Xcode/Release/Release10.6.dmgCanvas/Disk Image
+++ /dev/null
Binary files differ
diff --git a/Xcode/Release/Release10.6.dmgCanvas/QuickLook/Preview.jpg b/Xcode/Release/Release10.6.dmgCanvas/QuickLook/Preview.jpg
deleted file mode 100644
index 930c42a0b..000000000
--- a/Xcode/Release/Release10.6.dmgCanvas/QuickLook/Preview.jpg
+++ /dev/null
Binary files differ
diff --git a/Xcode/Release/Release10.7+.dmgCanvas/Disk Image b/Xcode/Release/Release10.7+.dmgCanvas/Disk Image
deleted file mode 100644
index 11f372249..000000000
--- a/Xcode/Release/Release10.7+.dmgCanvas/Disk Image
+++ /dev/null
Binary files differ
diff --git a/Xcode/Release/Release10.7+.dmgCanvas/QuickLook/Preview.jpg b/Xcode/Release/Release10.7+.dmgCanvas/QuickLook/Preview.jpg
deleted file mode 100644
index 875ac73dc..000000000
--- a/Xcode/Release/Release10.7+.dmgCanvas/QuickLook/Preview.jpg
+++ /dev/null
Binary files differ
diff --git a/build/packevol b/build/packevol
index 3cabea37d..0709a342c 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.4.1.18" \
+ -DPRODUCT_VERSION="1.4.2.1" \
-DEXESUFFIX=/src \
-DUPX=true \
evol.nsi
diff --git a/build/packtmw b/build/packtmw
index b6c6088b4..2d3134b8f 100755
--- a/build/packtmw
+++ b/build/packtmw
@@ -7,7 +7,7 @@ dir=`pwd`
cd packaging/windows
./make-translations.sh
makensis -DDLLDIR=$dir/../libs/dll/ \
- -DPRODUCT_VERSION="1.4.1.18" \
+ -DPRODUCT_VERSION="1.4.2.1" \
-DEXESUFFIX=/src \
-DUPX=true \
tmw.nsi
diff --git a/build/packwin b/build/packwin
index b91fdfac2..48ce669fa 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.4.1.18" \
+ -DPRODUCT_VERSION="1.4.2.1" \
-DEXESUFFIX=/src \
-DUPX=true \
setup.nsi
diff --git a/configure.ac b/configure.ac
index b44f12e33..49f6f0707 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.60)
-AC_INIT([ManaPlus], [1.4.1.18], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.4.2.1], [akaras@inbox.ru], [manaplus])
AM_INIT_AUTOMAKE([1.9])
AC_CONFIG_HEADERS([config.h:config.h.in])
AC_LANG_CPLUSPLUS
@@ -250,7 +250,7 @@ fi
AM_CONDITIONAL(USE_OPENGL, test x$with_opengl = xyes)
# Option to enable internal guichan
-AC_ARG_WITH(internalguichan,[ --without-internalguichan don't use internal guichan ] )
+AC_ARG_WITH(internalguichan,[ --without-internalguichan DEPRICATED. don't use internal guichan ] )
if test "x$with_internalguichan" == "xno"; then
with_internalguichan=no
diff --git a/po/ar.po b/po/ar.po
index bc3119289..ba9ea0923 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/manaplus/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr ""
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr ""
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -501,8 +501,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -529,31 +529,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "تثبيت"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr "مرئية"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr ""
@@ -566,7 +566,7 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -575,32 +575,32 @@ msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -615,7 +615,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -628,65 +628,65 @@ msgid "Error"
msgstr "خطأ"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -699,36 +699,36 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr ""
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -737,167 +737,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr ""
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -920,36 +932,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr ""
@@ -986,7 +998,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr ""
@@ -1001,7 +1013,7 @@ msgstr ""
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1009,34 +1021,34 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1061,8 +1073,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1082,7 +1094,7 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1095,7 +1107,7 @@ msgstr "شراء"
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1105,8 +1117,8 @@ msgstr "بيع"
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1132,7 +1144,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1140,7 +1152,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1163,19 +1175,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1188,44 +1200,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "إلغاء"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1235,20 +1247,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1257,7 +1269,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1265,69 +1277,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1337,68 +1349,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1407,64 +1419,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1472,42 +1484,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "استخدام"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1516,13 +1528,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1530,134 +1542,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1665,7 +1677,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1675,7 +1687,7 @@ msgstr "تجريد من العتاد"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "استعمال العتاد"
@@ -1683,14 +1695,14 @@ msgstr "استعمال العتاد"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1698,7 +1710,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr "إسقاط"
@@ -1706,48 +1718,48 @@ msgstr "إسقاط"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr "قسم"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2410,7 +2422,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2578,7 +2590,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr ""
@@ -2712,13 +2724,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2798,7 +2810,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3407,12 +3419,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3461,14 +3473,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "منخÙض"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr ""
@@ -3482,7 +3494,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "مرتÙع"
@@ -3837,17 +3849,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4357,8 +4374,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr ""
@@ -4457,8 +4474,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4490,61 +4507,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr "يجب إعادة التشغيل لتÙعّل التغييرات."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4596,93 +4613,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "عتمة واجهة المستخدم"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "مؤثّرات محيطة"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr ""
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5238,7 +5264,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr ""
@@ -5321,7 +5347,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6063,33 +6089,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6651,36 +6677,36 @@ msgid "Name: %s"
msgstr "الاسم: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr "جار٠الاتّصال..."
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr ""
@@ -6727,25 +6753,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6753,7 +6779,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7930,43 +7956,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr ""
diff --git a/po/bg.po b/po/bg.po
index 25e2505ef..77ee39ecc 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Bulgarian (http://www.transifex.com/projects/p/manaplus/language/bg/)\n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr ""
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr ""
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -497,8 +497,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -525,31 +525,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr ""
@@ -562,7 +562,7 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -571,32 +571,32 @@ msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -611,7 +611,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -624,65 +624,65 @@ msgid "Error"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -695,36 +695,36 @@ msgstr "Ðепозната команда."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr ""
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -733,167 +733,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr ""
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -916,36 +928,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr ""
@@ -982,7 +994,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr ""
@@ -997,7 +1009,7 @@ msgstr ""
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1005,34 +1017,34 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1057,8 +1069,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1078,7 +1090,7 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1091,7 +1103,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1101,8 +1113,8 @@ msgstr ""
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1128,7 +1140,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1136,7 +1148,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1159,19 +1171,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1184,44 +1196,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1231,20 +1243,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1253,7 +1265,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1261,69 +1273,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1333,68 +1345,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1403,64 +1415,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1468,42 +1480,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1512,13 +1524,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1526,134 +1538,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1661,7 +1673,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1671,7 +1683,7 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
@@ -1679,14 +1691,14 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1694,7 +1706,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr ""
@@ -1702,48 +1714,48 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2406,7 +2418,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2574,7 +2586,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr ""
@@ -2708,13 +2720,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2794,7 +2806,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3403,12 +3415,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3457,14 +3469,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr ""
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr ""
@@ -3478,7 +3490,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr ""
@@ -3833,17 +3845,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4353,8 +4370,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr ""
@@ -4453,8 +4470,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4486,61 +4503,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4592,93 +4609,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr ""
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr ""
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5234,7 +5260,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr ""
@@ -5317,7 +5343,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6051,33 +6077,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6639,36 +6665,36 @@ msgid "Name: %s"
msgstr ""
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr ""
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr ""
@@ -6715,25 +6741,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6741,7 +6767,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7918,43 +7944,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index c5ad41e80..7a1b5501a 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-12 18:57+0000\n"
-"Last-Translator: mas886 <thealchemist886@gmail.com>\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/manaplus/language/ca/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,12 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr "Ignorant sol·licituds d'intercanvi. "
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr "Acceptant sol·licituds d'intercanvi"
@@ -35,25 +35,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "esquiva "
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr "falla"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -498,8 +498,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -526,31 +526,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Configuració "
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr "Vídeo "
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr "Tema "
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Ajuda "
@@ -563,7 +563,7 @@ msgstr "Ajuda "
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -572,32 +572,32 @@ msgid "Close"
msgstr "Tancar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Connectant al servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Iniciant sessió "
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Entrant al mon de joc "
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "Sol·licitant personatges "
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "Connectant al servidor de joc "
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "Canviant servidors de joc"
@@ -612,7 +612,7 @@ msgstr "Canviant servidors de joc"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -625,65 +625,65 @@ msgid "Error"
msgstr "Error "
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "Sol·licitant detalls de registre"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "Canvi de contrasenya "
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "Contrasenya canviada amb èxit! "
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "Canvi de correu "
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "Correu canviat amb èxit! "
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "Registre anul·lat amb èxit "
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "Adéu, torna quan vulguis... "
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s no existeix i no pot ser creat! Sortint."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Error creant el directori d'actualitzacions! "
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Error: %s no existeix i no pot ser creat! Sortint."
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -696,36 +696,36 @@ msgstr "Comandament desconegut. "
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr "Si us plau especifica un nom."
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr "El jugador ja és %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr "Relació canviada amb èxit, el jugador es ara %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr "El jugador no pot ser %s!"
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "No es poden enviar xiuxiueigs buits! "
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -734,167 +734,179 @@ msgstr "No s'ha pogut crear pestanya de xiuxiueig pel nick \"%s\"! Ja existeix,
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Falta el nom del grup. "
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr "Falta el nom del gremi. "
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "Tornar a alternar el xat. "
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "Missatge tanca el xat. "
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "Torna ara a canviar el xat. "
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Missatge ara tanca el xat."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "amic"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr "desatès"
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr "neutral"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr "El jugador no estava ignorat! "
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr "El jugador ja no està ignorat!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr "El jugador no pot ser des-ignorat! "
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr "Personatge ja esborrat! "
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr "Personatge esborrat correctament!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr "El personatge no pot ser esborrat!"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -917,36 +929,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr "General"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr "Depurador "
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr "Error al guardar la captura de pantalla! "
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr "S'ha perdut la connexió amb el servidor."
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr "Error de xarxa "
@@ -983,7 +995,7 @@ msgstr "Pes: %s"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr ""
@@ -998,7 +1010,7 @@ msgstr ""
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1006,34 +1018,34 @@ msgstr "Atacar "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1058,8 +1070,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "Moure"
@@ -1079,7 +1091,7 @@ msgstr "Parlar "
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1092,7 +1104,7 @@ msgstr "Comprar"
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1102,8 +1114,8 @@ msgstr "Vendre "
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1129,7 +1141,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1137,7 +1149,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1160,19 +1172,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1185,44 +1197,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "Cancel·lar "
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr "Jugadors "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr "Afegir al xat"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr "Element del mapa"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1232,20 +1244,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1254,7 +1266,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1262,69 +1274,69 @@ msgstr "Conjunt "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr "Encanteris"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr "Netejar"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr "Desactivar ressaltat"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr "Activa resaltat "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr "Deixa"
@@ -1334,68 +1346,68 @@ msgstr "Deixa"
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr "Canviar la posició del gremi"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr "Canviar el nom de la marca de mapa"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr "Nom:"
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1404,64 +1416,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Botiga "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr "Emmagatzema 10 "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr "Emmagatzema la mitat "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr "Emmagatzema-ho tot"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr "Recuperar "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr "Recupera 10"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr "Recuperar la mitat"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr "Recupera-ho tot"
@@ -1469,42 +1481,42 @@ msgstr "Recupera-ho tot"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Utilitzar "
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1513,13 +1525,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1527,134 +1539,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr "Ignorar "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1662,7 +1674,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1672,7 +1684,7 @@ msgstr "Des-equipar "
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Equipar "
@@ -1680,14 +1692,14 @@ msgstr "Equipar "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr "Deixar caure... "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1695,7 +1707,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr "Deixar caure "
@@ -1703,48 +1715,48 @@ msgstr "Deixar caure "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr "Dividir "
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2407,7 +2419,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2575,7 +2587,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Efectes de partícules "
@@ -2709,13 +2721,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2795,7 +2807,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr "Editar"
@@ -3404,12 +3416,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3458,14 +3470,14 @@ msgstr "Per defecte "
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "baix "
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "mitjà "
@@ -3479,7 +3491,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "alt "
@@ -3834,17 +3846,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr "Mostra fons "
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4354,8 +4371,8 @@ msgstr "Tema canviat "
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr "Reinicia el client per que els canvis tinguin efecte."
@@ -4454,8 +4471,8 @@ msgstr "Límit d'FPS "
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr "Límit d'FPS alternatiu: "
@@ -4487,61 +4504,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr "Res"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr "Error al canviar al mode finestra, la restauració al mode anterior també ha fallat! "
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr "Error al canviar al mode pantalla completa, la restauració al mode anterior també ha fallat! "
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr "Canviant a pantalla completa "
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr "Reinici requerit per que els canvis tinguin efecte."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr "Canviant a OpenGL"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr "Aplicar un canvi a OpenGL requereix reinici. "
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr "Resolució personalitzada (exemple: 1024x768) "
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr "Entra nova resolució: "
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr "La resolució de la pantalla ha canviat "
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr "Algunes finestres poden ser mogudes per adaptar-se a la resolució més baixa. "
@@ -4593,93 +4610,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Opacitat d'interfície "
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "Sobrecàrrega de text"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Efectes d'ambient "
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "màxim "
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr "Detall de partícules "
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5235,7 +5261,7 @@ msgstr "Canvia compta d'accés "
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr ""
@@ -5318,7 +5344,7 @@ msgid "Whispering to %s: %s"
msgstr "Xiuxiuejant a %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6052,33 +6078,33 @@ msgid "Use same ip for game sub servers"
msgstr "Utilitza la mateixa ip per a sub-servidors del joc "
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Descarregant llista de servidors...%2.2f%% "
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr "Esperant el servidor... "
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr "Preparant descàrrega "
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr "Error recuperant llista de servidors! "
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr "requereix una nova versió "
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr "requereix v%s"
@@ -6640,36 +6666,36 @@ msgid "Name: %s"
msgstr ""
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr ""
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr ""
@@ -6716,25 +6742,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6742,7 +6768,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7919,43 +7945,43 @@ msgstr "OpenGL segur"
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 804e7391a..16d087271 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: 2014-01-18 12:47+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
"cs/)\n"
@@ -38,25 +38,25 @@ msgid "Visible on map"
msgstr "Viditelný na mapě"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:327
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "uskoÄil"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "miss"
msgstr "minul"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1933 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1938 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -530,31 +530,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1136 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Nastavení"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr "Téma"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1149 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Nápověda"
@@ -567,7 +567,7 @@ msgstr "Nápověda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1153 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -576,32 +576,32 @@ msgid "Close"
msgstr "Zavřít"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1278
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Připojuji se k serveru"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Přihlašuji se"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1364
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Vstupuji do herního světa"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1489
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "Požaduji postavy"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1529
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "Připojuji se k hernímu serveru"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1542
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "Zaměňuji herní servery"
@@ -616,7 +616,7 @@ msgstr "Zaměňuji herní servery"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1603 src/client.cpp:1614 src/client.cpp:1798
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -629,65 +629,65 @@ msgid "Error"
msgstr "Chyba"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1626
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "Požaduji registraÄní detaily"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1667
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "Změna hesla"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1669
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "Heslo úspěšně změněno!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1691
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "Změna emailu"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1693
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "Email úspěšně změněn!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1716
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "Zrušení registrace úspěšné"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1718
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "Nashledanou, vraťte se kdykoli..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1995 src/client.cpp:2010 src/client.cpp:2055
-#: src/client.cpp:2071 src/client.cpp:2520 src/client.cpp:2528
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s neexistuje a vytvoÅ™ení selhalo. KonÄím."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2227
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2268 src/client.cpp:2275
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Chyba při vytváření adresáře s updaty!"
-#: src/client.cpp:2297 src/client.cpp:2314
+#: src/client.cpp:2299 src/client.cpp:2316
#, 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."
#. TRANSLATORS: error message question
-#: src/client.cpp:2978
+#: src/client.cpp:3000
msgid "Do you want to open support page?"
msgstr ""
@@ -700,36 +700,36 @@ msgstr "Neznámý příkaz."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr "Prosím zadej jméno."
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr "HrÃ¡Ä je již %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr "HrÃ¡Ä byl úspěšnÄ› zaÅ™azen jako %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr "HrÃ¡Ä nemůže být zaÅ™azen jako %s!"
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Nelze zaslat prázdné šeptání!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -740,167 +740,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Chybí jméno party."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr "Chybí jméno guildy."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "Enter přepíná chat."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "Zpráva zavírá chat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "Enter nyní přepíná chat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Zpráva nyní ukonÄuje chat."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "přítel"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr "přehlížený"
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr "neutrální"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr "HrÃ¡Ä nebyl ignorován!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr "HrÃ¡Ä již není ignorován!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr "HrÃ¡Ä nemůže být odignorován!"
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr "HrÃ¡Ä již byl vymazán!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr "HrÃ¡Ä byl úspěšnÄ› vymazán!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr "HrÃ¡Ä nemůže být vymazán!"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:906 src/commands.cpp:962
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr "Doba běhu klienta: %s"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1116
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1342
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1349
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1356
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1380 src/commands.cpp:1389
+#: src/commands.cpp:1476 src/commands.cpp:1485
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1383 src/commands.cpp:1392
+#: src/commands.cpp:1479 src/commands.cpp:1488
msgid "Resource orphaned images:"
msgstr ""
@@ -936,23 +948,23 @@ msgid "Debug"
msgstr "Debug"
#. TRANSLATORS: save file message
-#: src/game.cpp:573
+#: src/game.cpp:572
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:583
+#: src/game.cpp:582
msgid "Saving screenshot failed!"
msgstr "Ukládání snímku obrazovky selhalo!"
#. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
msgid "The connection to the server was lost."
msgstr "Spojení se serverem bylo ztraceno."
#. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
msgid "Network Error"
msgstr "Chyba sítě"
@@ -1066,7 +1078,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
-#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1912 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "Jdi sem"
@@ -1178,7 +1190,7 @@ msgstr "Vložit jméno do chatu"
#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1797
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1260,7 +1272,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1412,7 +1424,7 @@ msgstr "Přidat vše do transakce"
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Uložit"
@@ -1477,7 +1489,7 @@ msgstr "Vzít všechny"
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Použít"
@@ -1668,9 +1680,9 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:680
+#: src/gui/windows/inventorywindow.cpp:682
msgid "Unequip"
msgstr "Odstranit z vybavení"
@@ -1679,7 +1691,7 @@ msgstr "Odstranit z vybavení"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Vybavit"
@@ -1687,7 +1699,7 @@ msgstr "Vybavit"
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:788
+#: src/gui/windows/inventorywindow.cpp:790
msgid "Drop..."
msgstr "Upustit..."
@@ -1702,7 +1714,7 @@ msgstr "Upustit vše"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:793
+#: src/gui/windows/inventorywindow.cpp:795
msgid "Drop"
msgstr "Upustit"
@@ -1791,8 +1803,9 @@ msgstr "Jdi na navigaÄní bod"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "Zastavit Útok"
+#, fuzzy
+msgid "Stop Attack / Modifier key"
+msgstr "Klávesa modifikátoru"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:105
@@ -2307,100 +2320,95 @@ msgstr "přemnout mód kamery"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr "Klávesa modifikátoru"
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
msgid "Show onscreen keyboard"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
msgid "Move Keys"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
msgid "Move Up"
msgstr "Pohyb nahoru"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
msgid "Move Down"
msgstr "Pohyb dolů"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
msgid "Move Left"
msgstr "Pohyb vlevo"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
msgid "Move Right"
msgstr "Pohyb vpravo"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
msgid "Move Forward"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
msgid "Move to navigation point shortcuts"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1440
-#: src/gui/setupactiondata.h:1446 src/gui/setupactiondata.h:1452
-#: src/gui/setupactiondata.h:1458 src/gui/setupactiondata.h:1464
-#: src/gui/setupactiondata.h:1470 src/gui/setupactiondata.h:1476
-#: src/gui/setupactiondata.h:1482 src/gui/setupactiondata.h:1488
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: src/gui/setupactiondata.h:1686 src/gui/setupactiondata.h:1692
-#: src/gui/setupactiondata.h:1698 src/gui/setupactiondata.h:1704
-#: src/gui/setupactiondata.h:1710 src/gui/setupactiondata.h:1716
+#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1434
+#: src/gui/setupactiondata.h:1440 src/gui/setupactiondata.h:1446
+#: src/gui/setupactiondata.h:1452 src/gui/setupactiondata.h:1458
+#: src/gui/setupactiondata.h:1464 src/gui/setupactiondata.h:1470
+#: src/gui/setupactiondata.h:1476 src/gui/setupactiondata.h:1482
+#: src/gui/setupactiondata.h:1488 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 src/gui/setupactiondata.h:1686
+#: src/gui/setupactiondata.h:1692 src/gui/setupactiondata.h:1698
+#: src/gui/setupactiondata.h:1704 src/gui/setupactiondata.h:1710
#, c-format
msgid "Move to point Shortcut %d"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
msgid "Move & selection"
msgstr "Pohyb a výběr"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
msgid "Move Home"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
msgid "Move End"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
msgid "Page up"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
msgid "Page down"
msgstr ""
@@ -2409,23 +2417,23 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1785 src/gui/setupactiondata.h:1930
+#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
msgstr "Ostatní"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
msgid "Select"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
msgid "Select2"
msgstr ""
@@ -2435,7 +2443,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1809 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
#: src/gui/windows/charselectdialog.cpp:106
#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
#: src/gui/windows/shopwindow.cpp:100
@@ -2444,45 +2452,45 @@ msgid "Delete"
msgstr "Smazat"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
msgid "Backspace"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
msgid "Insert"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
msgid "Tab"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
msgid "Mod"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
msgid "Ctrl"
msgstr ""
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
msgid "Basic"
msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1920 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
msgid "Shortcuts"
msgstr "Zkratky"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
#: src/gui/windowmenu.cpp:161
msgid "Windows"
msgstr ""
@@ -2490,7 +2498,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: emotes window name
#. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1924 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
#: src/gui/windows/emotewindow.cpp:107
msgid "Emotes"
msgstr ""
@@ -2498,13 +2506,13 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1928 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
msgid "Chat"
msgstr "Chat"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
msgid "Gui"
msgstr ""
@@ -2581,7 +2589,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Částicové efekty"
@@ -2715,14 +2723,14 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
-#: src/gui/windows/inventorywindow.cpp:598
+#: src/gui/widgets/characterdisplay.cpp:136
+#: src/gui/windows/inventorywindow.cpp:600
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2801,7 +2809,7 @@ msgstr "Otevři web adresu"
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:339 src/gui/widgets/setupitem.cpp:475
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr "Upravit"
@@ -3466,14 +3474,14 @@ msgstr "výchozí"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "nízký"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "střední"
@@ -3487,7 +3495,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "vysoký"
@@ -3843,9 +3851,8 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:376
-#, fuzzy
msgid "Screenshot directory"
-msgstr "Snímek obrazovky"
+msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:381
@@ -4368,8 +4375,8 @@ msgstr "Téma změněno"
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:499
+#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "Restartujte klient pro aplikováni změn."
@@ -4456,66 +4463,66 @@ msgid "Button %u action"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:190
msgid "Full screen"
msgstr "Celá obrazovka"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
msgid "FPS limit:"
msgstr "Omezení FPS:"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:194
-#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:198
+#: src/gui/widgets/tabs/setup_video.cpp:240
+#: src/gui/widgets/tabs/setup_video.cpp:429
+#: src/gui/widgets/tabs/setup_video.cpp:557
msgid "Alt FPS limit: "
msgstr "Altern. FPS omezení:"
#. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:197
+#: src/gui/widgets/tabs/setup_video.cpp:201
msgid "Detect best mode"
msgstr "Detekuj nejlepší mód"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:210
msgid "Show cursor"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:213
msgid "Custom cursor"
msgstr "Vlastní kurzor"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:217
msgid "Enable resize"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:220
msgid "No frame"
msgstr ""
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:241
+#: src/gui/widgets/tabs/setup_video.cpp:427
+#: src/gui/widgets/tabs/setup_video.cpp:541
+#: src/gui/widgets/tabs/setup_video.cpp:554
msgid "None"
msgstr "Žádné"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:349
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
"Selhalo přepnutí do módu v okně a obnovení předchozího módu taktéž selhalo!"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:356
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
@@ -4523,42 +4530,42 @@ msgstr ""
"selhalo!"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:368
msgid "Switching to Full Screen"
msgstr "Přepínám na celou obrazovku"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:370
msgid "Restart needed for changes to take effect."
msgstr "Pro uplatnění změn je potřeba restart."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:388
msgid "Changing to OpenGL"
msgstr "Měním na OpenGL"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:390
msgid "Applying change to OpenGL requires restart."
msgstr "Změny v OpenGL vyžadují restart."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:468
msgid "Custom resolution (example: 1024x768)"
msgstr "Vlastní rozlišení (příklad: 1024x768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:470
msgid "Enter new resolution: "
msgstr "Zadej nové rozlišení:"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:497
+#: src/gui/widgets/tabs/setup_video.cpp:506
msgid "Screen Resolution Changed"
msgstr "Rozlišení obrazovky změněno"
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:500
msgid "Some windows may be moved to fit the lowered resolution."
msgstr "Některá okna mohou být přesunuta aby se vešly do menšího okna."
@@ -4610,93 +4617,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Neprůhlednost GUI"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "Text nad hlavou"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Efekty prostředí"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "max"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr "Detaily Äástic"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr "Centruj okno hry"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr "Povol spuÅ¡tÄ›ní spoÅ™iÄe obrazovky"
@@ -4815,7 +4831,7 @@ msgstr "EQU"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
#: src/gui/windows/inventorywindow.cpp:228
msgid "Equipment"
msgstr "Vybavení"
@@ -5336,7 +5352,7 @@ msgid "Whispering to %s: %s"
msgstr "Šeptání pro %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1607
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6093,12 +6109,12 @@ msgid "Error retreiving server list!"
msgstr "Chyba při získávání seznamu serverů!"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:638
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr "potřebuje novější verzi"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:643
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr "potřebuje v%s"
@@ -7983,3 +7999,6 @@ msgstr "Neznámý předmět"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
+
+#~ msgid "Stop Attack"
+#~ msgstr "Zastavit Útok"
diff --git a/po/da.po b/po/da.po
index 4002915c5..fa698cd6e 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+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"
@@ -20,12 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr "Ignorerer indkomne handels anmodninger"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr "Accepterer indkomne handels anmodninger"
@@ -35,25 +35,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -498,8 +498,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -526,31 +526,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Opsætning"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Hjælp"
@@ -563,7 +563,7 @@ msgstr "Hjælp"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -572,32 +572,32 @@ msgid "Close"
msgstr "Luk"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Forbinder til server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Logger ind"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -612,7 +612,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -625,65 +625,65 @@ msgid "Error"
msgstr "Fejl"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Fejl under oprettelsen af opdateringen mappen!"
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -696,36 +696,36 @@ msgstr "Ukendt kommando"
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "du kan ikke sende en hviskebesked uden tekst!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -734,167 +734,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Du glemte at skrive et navn på dit party."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "Retur bringer focus på chatten."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "Besked lukker chat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "Enter bringer nu focus på chatten."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Besked lukker nu chat."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -917,36 +929,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr "Gemningen af skærmbilledet fejlede!"
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr "Netværksfejl"
@@ -983,7 +995,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr "Handl"
@@ -998,7 +1010,7 @@ msgstr "Handl"
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1006,34 +1018,34 @@ msgstr "Angrib"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1058,8 +1070,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1079,7 +1091,7 @@ msgstr "Snak"
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1092,7 +1104,7 @@ msgstr "Køb"
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1102,8 +1114,8 @@ msgstr "Sælg"
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1129,7 +1141,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1137,7 +1149,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1160,19 +1172,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1185,44 +1197,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "Fortryd"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr "Brugere"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1232,20 +1244,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1254,7 +1266,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1262,69 +1274,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1334,68 +1346,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1404,64 +1416,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Gem på lager"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr "Hent fra lager"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1469,42 +1481,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Brug"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1513,13 +1525,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1527,134 +1539,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1662,7 +1674,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1672,7 +1684,7 @@ msgstr "Tag af"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Tag på"
@@ -1680,14 +1692,14 @@ msgstr "Tag på"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1695,7 +1707,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr "Smid"
@@ -1703,48 +1715,48 @@ msgstr "Smid"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr "Opdel"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2407,7 +2419,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2575,7 +2587,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Partikeleffekter"
@@ -2709,13 +2721,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2795,7 +2807,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3404,12 +3416,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3458,14 +3470,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "lav"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "mellem"
@@ -3479,7 +3491,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "høj"
@@ -3834,17 +3846,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4354,8 +4371,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr "Ændringerne kræver at du genstarter klienten."
@@ -4454,8 +4471,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4487,61 +4504,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr "Ændringerne kræver at du genstarter klienten."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4593,93 +4610,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Gennemsigtighed"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Omgivende FX"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "maks"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5235,7 +5261,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr "Spil"
@@ -5318,7 +5344,7 @@ msgid "Whispering to %s: %s"
msgstr "Hvisker til %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6052,33 +6078,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6640,36 +6666,36 @@ msgid "Name: %s"
msgstr "Navn: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr "Updatere..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr "Opretter forbindelse..."
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr "##1 Opdateringsprocessen er ikke færdiggjort"
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr "##1 Det er varmt anbefalet at"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr "Udført"
@@ -6716,25 +6742,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6742,7 +6768,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7919,43 +7945,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "unavngivet"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr "Ukendt genstand"
diff --git a/po/de.po b/po/de.po
index c60de6381..6ba75d396 100644
--- a/po/de.po
+++ b/po/de.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-01-18 12:47+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
"de/)\n"
@@ -48,25 +48,25 @@ msgid "Visible on map"
msgstr "Sichtbar auf der Karte"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:327
+#: src/being/being.cpp:329
msgid "Human"
msgstr "Mensch"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "ausweichen"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "miss"
msgstr "verfehlt"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1933 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1938 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "I"
@@ -539,31 +539,31 @@ msgstr "Schwebende Blase"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1136 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Einstellungen"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr "Theme"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1149 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Hilfe"
@@ -576,7 +576,7 @@ msgstr "Hilfe"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1153 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -585,32 +585,32 @@ msgid "Close"
msgstr "Schließen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1278
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Verbinde zum Server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Anmelden"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1364
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Betrete die Spielwelt"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1489
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "Spielfiguren werden abgefragt"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1529
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "Verbinde zum Charakterserver"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1542
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "Charakterserver wechseln"
@@ -625,7 +625,7 @@ msgstr "Charakterserver wechseln"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1603 src/client.cpp:1614 src/client.cpp:1798
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -638,66 +638,66 @@ msgid "Error"
msgstr "Fehler"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1626
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "Anfrage der Registrierungsdetails"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1667
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "Passwort ändern"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1669
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "Passwort erfolgreich geändert!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1691
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "E-Mail ändern"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1693
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "E-Mail erfolgreich geändert!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1716
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "Erfolgreich abgemeldet."
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1718
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "Leb wohl und komm jeder Zeit wieder..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1995 src/client.cpp:2010 src/client.cpp:2055
-#: src/client.cpp:2071 src/client.cpp:2520 src/client.cpp:2528
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2227
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2268 src/client.cpp:2275
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
-#: src/client.cpp:2297 src/client.cpp:2314
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
"Fehler: %s existiert nicht und kann nicht erstellt werden! Verlassend..."
#. TRANSLATORS: error message question
-#: src/client.cpp:2978
+#: src/client.cpp:3000
msgid "Do you want to open support page?"
msgstr ""
@@ -710,36 +710,36 @@ msgstr "Unbekannter Befehl."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr "Bitte gib einen Namen an."
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr "Spieler ist bereits %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr "Spieler erfolgreich %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr "Spieler konnte nicht %s werden!"
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Kann keine leeren Nachrichten versenden!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -750,167 +750,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr "Cache geleert"
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Name der Gruppe fehlt."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr "Name der Gilde fehlt."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "Enter-Taste steuert den Chat (zeigen/verstecken)"
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "Nachricht schließt den Chat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "Enter aktiviert jetzt den Chat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Nachricht schließt jetzt den Chat."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "Freund"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr "missachtet"
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr "neutral"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr "Spieler wurde nicht ignoriert!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr "Spieler wird nicht länger ignoriert!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!"
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr "Auf die schwarze Liste gesetzt"
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr "Feind"
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr "Spieler ist bereits gelöscht!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr "Spieler erfolgreich gelöscht!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr "Spieler konnte nicht gelöscht werden!"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:906 src/commands.cpp:962
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr "Client läuft seit: %s"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr "%d Wochen"
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr "%d Wochen"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr "%d Tage"
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr "%d Tage"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr "%d Stunden"
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr "%d Stunden"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr "%d Minuten"
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr "%d Minuten"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr "%d Sekunden"
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr "%d Sekunden"
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1116
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr "Ausgabe der Umgebungsvariablen"
+#: src/commands.cpp:1342
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1349
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1356
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1380 src/commands.cpp:1389
+#: src/commands.cpp:1476 src/commands.cpp:1485
msgid "Resource images:"
msgstr "Bild-Quellen:"
#. TRANSLATORS: dump command
-#: src/commands.cpp:1383 src/commands.cpp:1392
+#: src/commands.cpp:1479 src/commands.cpp:1488
msgid "Resource orphaned images:"
msgstr "Quelle verwaister Bilddataien:"
@@ -947,23 +959,23 @@ msgid "Debug"
msgstr "Debug"
#. TRANSLATORS: save file message
-#: src/game.cpp:573
+#: src/game.cpp:572
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:583
+#: src/game.cpp:582
msgid "Saving screenshot failed!"
msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
#. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
msgid "The connection to the server was lost."
msgstr "Die Verbindung zum Server wurde getrennt."
#. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
msgid "Network Error"
msgstr "Netzwerkfehler"
@@ -1077,7 +1089,7 @@ msgstr "Atombombe"
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
-#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1912 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "Bewegen"
@@ -1189,7 +1201,7 @@ msgstr "Füge Name dem Chat hinzu"
#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1797
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1271,7 +1283,7 @@ msgstr "Bewege Kamera"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1423,7 +1435,7 @@ msgstr "Alles zum Handeln hinzufügen"
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Aufbewahren"
@@ -1488,7 +1500,7 @@ msgstr "Alles abholen"
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Benutzen"
@@ -1679,9 +1691,9 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:680
+#: src/gui/windows/inventorywindow.cpp:682
msgid "Unequip"
msgstr "Ablegen"
@@ -1690,7 +1702,7 @@ msgstr "Ablegen"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Ausrüsten"
@@ -1698,7 +1710,7 @@ msgstr "Ausrüsten"
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:788
+#: src/gui/windows/inventorywindow.cpp:790
msgid "Drop..."
msgstr "Wegwerfen"
@@ -1713,7 +1725,7 @@ msgstr "Alles fallenlassen"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:793
+#: src/gui/windows/inventorywindow.cpp:795
msgid "Drop"
msgstr "Wegwerfen"
@@ -1802,8 +1814,9 @@ msgstr "Bewegen zum Navigationspunkt"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "Angriff abbrechen"
+#, fuzzy
+msgid "Stop Attack / Modifier key"
+msgstr "Kurzbefehle Modifier-Tasten"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:105
@@ -2318,100 +2331,95 @@ msgstr "Ändere Kameramodus"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr "Modifikationstaste"
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
msgid "Show onscreen keyboard"
msgstr "Zeige Onscreen Tastatur"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
msgid "Move Keys"
msgstr "Bewegungstasten"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
msgid "Move Up"
msgstr "Laufe Hoch"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
msgid "Move Down"
msgstr "Laufe Runter"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
msgid "Move Left"
msgstr "Laufe nach Links"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
msgid "Move Right"
msgstr "Laufe nach Rechts"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
msgid "Move Forward"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
msgid "Move to navigation point shortcuts"
msgstr "Kurzbefehle für die Bewegung zu einem Navigationspunkt"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1440
-#: src/gui/setupactiondata.h:1446 src/gui/setupactiondata.h:1452
-#: src/gui/setupactiondata.h:1458 src/gui/setupactiondata.h:1464
-#: src/gui/setupactiondata.h:1470 src/gui/setupactiondata.h:1476
-#: src/gui/setupactiondata.h:1482 src/gui/setupactiondata.h:1488
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: src/gui/setupactiondata.h:1686 src/gui/setupactiondata.h:1692
-#: src/gui/setupactiondata.h:1698 src/gui/setupactiondata.h:1704
-#: src/gui/setupactiondata.h:1710 src/gui/setupactiondata.h:1716
+#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1434
+#: src/gui/setupactiondata.h:1440 src/gui/setupactiondata.h:1446
+#: src/gui/setupactiondata.h:1452 src/gui/setupactiondata.h:1458
+#: src/gui/setupactiondata.h:1464 src/gui/setupactiondata.h:1470
+#: src/gui/setupactiondata.h:1476 src/gui/setupactiondata.h:1482
+#: src/gui/setupactiondata.h:1488 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 src/gui/setupactiondata.h:1686
+#: src/gui/setupactiondata.h:1692 src/gui/setupactiondata.h:1698
+#: src/gui/setupactiondata.h:1704 src/gui/setupactiondata.h:1710
#, c-format
msgid "Move to point Shortcut %d"
msgstr "Kurzbefehl Bewegung zu Punkt %d"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
msgid "Move & selection"
msgstr "Auswählen & Bewegen"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
msgid "Move Home"
msgstr "Bewegen zum Anfang"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
msgid "Move End"
msgstr "Bewegen zum Ende"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
msgid "Page up"
msgstr "Seite hoch"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
msgid "Page down"
msgstr "Seite runter"
@@ -2420,23 +2428,23 @@ msgstr "Seite runter"
#. TRANSLATORS: settings group
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1785 src/gui/setupactiondata.h:1930
+#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
msgstr "Sonstig"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
msgid "Select"
msgstr "Auswahl"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
msgid "Select2"
msgstr "Auswahl 2"
@@ -2446,7 +2454,7 @@ msgstr "Auswahl 2"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1809 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
#: src/gui/windows/charselectdialog.cpp:106
#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
#: src/gui/windows/shopwindow.cpp:100
@@ -2455,45 +2463,45 @@ msgid "Delete"
msgstr "Löschen"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
msgid "Backspace"
msgstr "Backspace"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
msgid "Insert"
msgstr "Einfügen"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
msgid "Tab"
msgstr "Tab"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
msgid "Mod"
msgstr "Mod"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
msgid "Ctrl"
msgstr ""
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
msgid "Basic"
msgstr "Normal"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1920 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
msgid "Shortcuts"
msgstr "Tastenkürzel"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
#: src/gui/windowmenu.cpp:161
msgid "Windows"
msgstr "Fenster"
@@ -2501,7 +2509,7 @@ msgstr "Fenster"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: emotes window name
#. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1924 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
#: src/gui/windows/emotewindow.cpp:107
msgid "Emotes"
msgstr "Gefühle"
@@ -2509,13 +2517,13 @@ msgstr "Gefühle"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1928 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
msgid "Chat"
msgstr "Chat"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
msgid "Gui"
msgstr "GUI"
@@ -2592,7 +2600,7 @@ msgstr "Gildenmitglieder"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Partikeleffekte"
@@ -2726,14 +2734,14 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr "Level: %u"
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
-#: src/gui/windows/inventorywindow.cpp:598
+#: src/gui/widgets/characterdisplay.cpp:136
+#: src/gui/windows/inventorywindow.cpp:600
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2812,7 +2820,7 @@ msgstr "URL öffnen"
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:339 src/gui/widgets/setupitem.cpp:475
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr "Ändern"
@@ -3479,14 +3487,14 @@ msgstr "Standard"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "Niedrig"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "Mittel"
@@ -3500,7 +3508,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "Hoch"
@@ -3856,9 +3864,8 @@ msgstr "Benutze FBO für Bildschirmfotos (nur für openGL)"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:376
-#, fuzzy
msgid "Screenshot directory"
-msgstr "Bildschirmfoto"
+msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:381
@@ -4381,8 +4388,8 @@ msgstr "Theme geändert"
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:499
+#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "Starte das Spiel neu, um die Änderungen zu übernehmen."
@@ -4469,59 +4476,59 @@ msgid "Button %u action"
msgstr "Taste %u Aktion"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:190
msgid "Full screen"
msgstr "Vollbild"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
msgid "FPS limit:"
msgstr "FPS Limit:"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:194
-#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:198
+#: src/gui/widgets/tabs/setup_video.cpp:240
+#: src/gui/widgets/tabs/setup_video.cpp:429
+#: src/gui/widgets/tabs/setup_video.cpp:557
msgid "Alt FPS limit: "
msgstr "Alt FPS Limit:"
#. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:197
+#: src/gui/widgets/tabs/setup_video.cpp:201
msgid "Detect best mode"
msgstr "besten Modus ermitteln"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:210
msgid "Show cursor"
msgstr "Cursor anzeigen"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:213
msgid "Custom cursor"
msgstr "Benutzerdefinierter Zeiger"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:217
msgid "Enable resize"
msgstr "Erlaube Größenanpassung"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:220
msgid "No frame"
msgstr "Kein Fensterrahmen"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:241
+#: src/gui/widgets/tabs/setup_video.cpp:427
+#: src/gui/widgets/tabs/setup_video.cpp:541
+#: src/gui/widgets/tabs/setup_video.cpp:554
msgid "None"
msgstr "Kein(e)"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:349
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
@@ -4529,7 +4536,7 @@ msgstr ""
"Auflösung schlug fehl."
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:356
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
@@ -4537,44 +4544,44 @@ msgstr ""
"Auflösung schlug fehl."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:368
msgid "Switching to Full Screen"
msgstr "Wechsle zum Vollbildmodus"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:370
msgid "Restart needed for changes to take effect."
msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:388
msgid "Changing to OpenGL"
msgstr "Wechsle zu OpenGL"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:390
msgid "Applying change to OpenGL requires restart."
msgstr ""
"Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
"übernommen."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:468
msgid "Custom resolution (example: 1024x768)"
msgstr "Benutzerdefinierte Auflösung (zum Beispiel: 1024x768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:470
msgid "Enter new resolution: "
msgstr "Neue Auflösung eingeben:"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:497
+#: src/gui/widgets/tabs/setup_video.cpp:506
msgid "Screen Resolution Changed"
msgstr "Bildschirmauflösung wurde geändert"
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:500
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Einige Fenster können verschoben werden um sich an die geänderte Auflösung "
@@ -4628,93 +4635,102 @@ msgid "on"
msgstr "an"
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr "Visuell"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr "Benachrichtigungen"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr "Zeige Aufhebenachrichten im Chat"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr "Zeige Aufhebenachrichten als Partikeleffekte"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr "Effekte"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr "Benutze Maus- und Tastatureingaben"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr "Unscharfe Texturen (OpenGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "GUI Transparenz"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "Chat über Spielern"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Hintergrundeffekte"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "max"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr "Partikeldetail"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr "Partikeleffekt"
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr "Gamma"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr "Aktiviere Gamma Control"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr "Vsync"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr "Spielfenster zentrieren"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr "Erlaube Bildschirmschoner"
@@ -4833,7 +4849,7 @@ msgstr "EQU"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
#: src/gui/windows/inventorywindow.cpp:228
msgid "Equipment"
msgstr "Ausrüstung"
@@ -5354,7 +5370,7 @@ msgid "Whispering to %s: %s"
msgstr "Flüstern zu %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1607
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6111,12 +6127,12 @@ msgid "Error retreiving server list!"
msgstr "Fehler beim Empfangen der Serverliste!"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:638
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr "benötigt eine neuere Version"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:643
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr "benötigt v%s"
@@ -8023,3 +8039,9 @@ msgstr "Unbekannter Gegenstand"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
+
+#~ msgid "Stop Attack"
+#~ msgstr "Angriff abbrechen"
+
+#~ msgid "Modifier key"
+#~ msgstr "Modifikationstaste"
diff --git a/po/el.po b/po/el.po
index fca8556da..32401531e 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+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"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr ""
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr "Αποδεχόμενος τα εισεÏχόμενα αιτήματα του εμποÏίου"
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "υπευκφυγή"
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr "αστοχία"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -497,8 +497,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -525,31 +525,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "ΡÏθμισεις"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Βοήθεια"
@@ -562,7 +562,7 @@ msgstr "Βοήθεια"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -571,32 +571,32 @@ msgid "Close"
msgstr "Κλείσιμο"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "ΣÏνδεση σε τονδιακομιστή"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "ΣÏνδεση"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Μπαίνοντας στον κόσμο του Ï€Î±Î¹Ï‡Î½Î¹Î´Î¹Î¿Ï "
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "Αναζητώντας χαÏακτήÏες"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "ΣÏνδεση με τον διακομιστή του παιχνιδιοÏ"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "Αλλαγή διακοσμητών στο παιχνίδι"
@@ -611,7 +611,7 @@ msgstr "Αλλαγή διακοσμητών στο παιχνίδι"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -624,65 +624,65 @@ msgid "Error"
msgstr "Σφάλμα"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "ΑναζητοÏνται τα στοιχεία της εγγÏαφής"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "Αλλαγή ÎºÏ‰Î´Î¹ÎºÎ¿Ï Ï€Ïόσβασης"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "Ο κωδικός σας άλλαξε με επιτυχία!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "Αλλαγή ηλεκτÏÎ¿Î½Î¹ÎºÎ¿Ï Ï„Î±Ï‡Ï…Î´Ïομείου"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "ΗλεκτÏονικό ταχυδÏομείο άλλαξε με επιτυχία!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "ΔιαγÏαφή Επιτυχής"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "Αντίο, να επιστÏέψεις κάθε στιγμή ..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr " %s δεν υπάÏχει και δεν μποÏεί να δημιουÏγηθεί!Έξοδος."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Σφάλμα κατά τη δημιουÏγία του καταλόγου ενημεÏώσεων!"
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Σφάλμα: %s δεν υπάÏχει και δεν μποÏεί να δημιουÏγηθεί! Εγκατάλειψη."
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -695,36 +695,36 @@ msgstr "Άγνωστη εντολή."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr "ΟÏίστε ένα όνομα."
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr "Παίκτης ήδη %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr "Παίκτης με επιτυχία %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr "Ο παίκτης δεν θα μποÏοÏσε να είναι %s!"
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Δεν είναι δυνατή η αποστολή άδειου ψιθÏÏου!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -733,167 +733,179 @@ msgstr "Δεν μποÏεί να δημιουÏγηθεί μια καÏτέλα
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Το όνομα του κόμματος λείπει. "
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr "Το όνομα της συντεχνείας λείπει."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "φίλος"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr "αγνόησε"
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr "ουδέτεÏος"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr "Ο παίκτης δεν αγνοήθηκε!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr "Παίκτης δεν είναι πλέον αγνοημένος!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr "Παίκτης δεν θα μποÏοÏσε να unignored!"
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -916,36 +928,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr "Γενικά"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr "Αποσφαλμάτωση"
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr "Σώσιμο φωτογÏαφίας απέτυχε"
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr "Η σÏνδεση με το διακομιστή χάθηκε."
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr "Σφάλμα δικτÏου"
@@ -982,7 +994,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr ""
@@ -997,7 +1009,7 @@ msgstr ""
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1005,34 +1017,34 @@ msgstr "Επίθεση"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1057,8 +1069,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "Κίνηση"
@@ -1078,7 +1090,7 @@ msgstr "Συζήτηση"
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1091,7 +1103,7 @@ msgstr "ΑγοÏά"
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1101,8 +1113,8 @@ msgstr "Πουλήστε"
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1128,7 +1140,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1136,7 +1148,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1159,19 +1171,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1184,44 +1196,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "ΑκÏÏωση"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr "ΠÏοσθήκη στη συζήτηση"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1231,20 +1243,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1253,7 +1265,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1261,69 +1273,69 @@ msgstr "ΡοÏχα"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr "ΞόÏκια"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr "Σαφή"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1333,68 +1345,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr "Μετονομασία υπογÏάψει χάÏτη "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr "Όνομα:"
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1403,64 +1415,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Κατάστημα"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr "Κατάστημα 10"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr "Αποθήκευσε τα μισά"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr "ΑποθηκεÏστε όλα τα"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr "Ανάκτηση"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr "Ανέκτησε τα μισά"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr "Ανέκτησε όλα"
@@ -1468,42 +1480,42 @@ msgstr "Ανέκτησε όλα"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "ΧÏήση"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1512,13 +1524,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1526,134 +1538,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr "ΠαÏάβλεψη"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1661,7 +1673,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1671,7 +1683,7 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Equip"
@@ -1679,14 +1691,14 @@ msgstr "Equip"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr "Πέτα ..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1694,7 +1706,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr "Πέτα"
@@ -1702,48 +1714,48 @@ msgstr "Πέτα"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr "ΔιαίÏεση"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2406,7 +2418,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2574,7 +2586,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr ""
@@ -2708,13 +2720,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2794,7 +2806,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3403,12 +3415,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3457,14 +3469,14 @@ msgstr "Ï€Ïοεπιλογή"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr ""
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr ""
@@ -3478,7 +3490,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr ""
@@ -3833,17 +3845,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4353,8 +4370,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr ""
@@ -4453,8 +4470,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4486,61 +4503,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr "ΠληκτÏολογήστε το νέα ανάλυση:"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr "Ανάλυση οθόνης Άλλαξε"
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr "ΜεÏικά παÏάθυÏα μποÏοÏν να μετακινοÏνται για να ταιÏιάξει στην χαμηλότεÏη ανάλυση."
@@ -4592,93 +4609,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr ""
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr ""
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5234,7 +5260,7 @@ msgstr "Διακόπτης ΣÏνδεση"
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr ""
@@ -5317,7 +5343,7 @@ msgid "Whispering to %s: %s"
msgstr "ΨιθυÏίζοντας στο %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6051,33 +6077,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6639,36 +6665,36 @@ msgid "Name: %s"
msgstr ""
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr ""
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr ""
@@ -6715,25 +6741,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6741,7 +6767,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7918,43 +7944,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 4e8ab37f8..df4d952b0 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/manaplus/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -20,12 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr "Ignoring incoming trade requests"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr "Accepting incoming trade requests"
@@ -35,25 +35,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "dodge"
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr "miss"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -498,8 +498,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -526,31 +526,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Setup"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Help"
@@ -563,7 +563,7 @@ msgstr "Help"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -572,32 +572,32 @@ msgid "Close"
msgstr "Close"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Connecting to server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Logging in"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Entering game world"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "Requesting characters"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "Connecting to the game server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "Changing game servers"
@@ -612,7 +612,7 @@ msgstr "Changing game servers"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -625,65 +625,65 @@ msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "Requesting registration details"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "Password Change"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Error creating updates directory!"
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -696,36 +696,36 @@ msgstr "Unknown command."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Cannot send empty whispers!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -734,167 +734,179 @@ msgstr "Cannot create a whisper tab for nick \"%s\"! It either already exists, o
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Party name is missing."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "Return toggles chat."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "Message closes chat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "Return now toggles chat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Message now closes chat."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -917,36 +929,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr "General"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr "Saving screenshot failed!"
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr "Network Error"
@@ -983,7 +995,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr "Trade"
@@ -998,7 +1010,7 @@ msgstr "Trade"
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1006,34 +1018,34 @@ msgstr "Attack"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1058,8 +1070,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1079,7 +1091,7 @@ msgstr "Talk"
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1092,7 +1104,7 @@ msgstr "Buy"
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1102,8 +1114,8 @@ msgstr "Sell"
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1129,7 +1141,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1137,7 +1149,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1160,19 +1172,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1185,44 +1197,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "Cancel"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr "Players"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1232,20 +1244,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1254,7 +1266,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1262,69 +1274,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1334,68 +1346,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1404,64 +1416,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Store"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr "Retrieve"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1469,42 +1481,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Use"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1513,13 +1525,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1527,134 +1539,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1662,7 +1674,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1672,7 +1684,7 @@ msgstr "Unequip"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Equip"
@@ -1680,14 +1692,14 @@ msgstr "Equip"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1695,7 +1707,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr "Drop"
@@ -1703,48 +1715,48 @@ msgstr "Drop"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr "Split"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2407,7 +2419,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2575,7 +2587,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Particle effects"
@@ -2709,13 +2721,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2795,7 +2807,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3404,12 +3416,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3458,14 +3470,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "low"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "medium"
@@ -3479,7 +3491,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "high"
@@ -3834,17 +3846,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4354,8 +4371,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr "Restart your client for the change to take effect."
@@ -4454,8 +4471,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4487,61 +4504,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr "Restart needed for changes to take effect."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr "Applying change to OpenGL requires restart."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4593,93 +4610,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Gui opacity"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "Overhead text"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Ambient FX"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "max"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5235,7 +5261,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr "Play"
@@ -5318,7 +5344,7 @@ msgid "Whispering to %s: %s"
msgstr "Whispering to %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6052,33 +6078,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6640,36 +6666,36 @@ msgid "Name: %s"
msgstr "Name: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr "Updating..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr "Connecting..."
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr "##1 The update process is incomplete."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr "##1 It is strongly recommended that"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr "Completed"
@@ -6716,25 +6742,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6742,7 +6768,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7919,43 +7945,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "unnamed"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr "Unknown item"
diff --git a/po/eo.po b/po/eo.po
index a6dce2000..99cbe2995 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/manaplus/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -20,12 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr ""
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr ""
@@ -35,25 +35,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "I"
@@ -498,8 +498,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -526,31 +526,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Helpo"
@@ -563,7 +563,7 @@ msgstr "Helpo"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -572,32 +572,32 @@ msgid "Close"
msgstr "Fermi"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -612,7 +612,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -625,65 +625,65 @@ msgid "Error"
msgstr "Eraro"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -696,36 +696,36 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr ""
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -734,167 +734,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr ""
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "amiko"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr "malamiko"
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -917,36 +929,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr ""
@@ -983,7 +995,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr ""
@@ -998,7 +1010,7 @@ msgstr ""
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1006,34 +1018,34 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr "Sanigi"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1058,8 +1070,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "Movi"
@@ -1079,7 +1091,7 @@ msgstr "Paroli"
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1092,7 +1104,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1102,8 +1114,8 @@ msgstr ""
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1129,7 +1141,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1137,7 +1149,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1160,19 +1172,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1185,44 +1197,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "Nuligi"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr "Ludantoj"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1232,20 +1244,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1254,7 +1266,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1262,69 +1274,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr "Forlasi"
@@ -1334,68 +1346,68 @@ msgstr "Forlasi"
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr "Nomo:"
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1404,64 +1416,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1469,42 +1481,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Uzi"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1513,13 +1525,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1527,134 +1539,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr "Ignori"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr "Forigi"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr "Malignori"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr "Sekvi"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr "Imitado"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1662,7 +1674,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1672,7 +1684,7 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
@@ -1680,14 +1692,14 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1695,7 +1707,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr ""
@@ -1703,48 +1715,48 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2407,7 +2419,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2575,7 +2587,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr ""
@@ -2709,13 +2721,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2795,7 +2807,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3404,12 +3416,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3458,14 +3470,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr ""
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr ""
@@ -3479,7 +3491,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr ""
@@ -3834,17 +3846,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4354,8 +4371,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr ""
@@ -4454,8 +4471,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4487,61 +4504,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4593,93 +4610,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr "Efektoj"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr ""
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr ""
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5235,7 +5261,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr "Ludi"
@@ -5318,7 +5344,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6052,33 +6078,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6640,36 +6666,36 @@ msgid "Name: %s"
msgstr "Nomo: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr ""
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr ""
@@ -6716,25 +6742,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6742,7 +6768,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7919,43 +7945,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "sennoma"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 8de922503..8f4e314ac 100644
--- a/po/es.po
+++ b/po/es.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-01-18 12:47+0300\n"
-"PO-Revision-Date: 2014-01-11 17:02+0000\n"
-"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
"language/es/)\n"
"Language: es\n"
@@ -44,25 +44,25 @@ msgid "Visible on map"
msgstr "Visibles en el mapa"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:327
+#: src/being/being.cpp:329
msgid "Human"
msgstr "Humano"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "evade"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "miss"
msgstr "falla"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1933 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1938 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "I"
@@ -535,31 +535,31 @@ msgstr "Burbuja flotante"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1136 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Configuración"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr "Rendimiento"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1149 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Ayuda"
@@ -572,7 +572,7 @@ msgstr "Ayuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1153 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -581,32 +581,32 @@ msgid "Close"
msgstr "Cerrar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1278
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Conectando al servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Accediendo a la cuenta"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1364
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Entrando al mundo del juego"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1489
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "Cargando personajes"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1529
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "Conectando al servidor del juego"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1542
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "Cambiando servidores del juego"
@@ -621,7 +621,7 @@ msgstr "Cambiando servidores del juego"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1603 src/client.cpp:1614 src/client.cpp:1798
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -634,65 +634,65 @@ msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1626
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "Solicitando detalles de registro"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1667
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "Cambio de contraseña"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1669
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "¡Contraseña cambiada exitosamente!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1691
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "Cambio de Email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1693
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "¡Email modificado exitosamente!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1716
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "Registro cancelado"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1718
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "Adiós, vuelve cuando quieras..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1995 src/client.cpp:2010 src/client.cpp:2055
-#: src/client.cpp:2071 src/client.cpp:2520 src/client.cpp:2528
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "¡%s no existe y no puede ser creado! Saliendo."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2227
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr "Servidor de actualización inválido: %s."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2268 src/client.cpp:2275
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "¡Error al crear la carpeta de actualizaciones!"
-#: src/client.cpp:2297 src/client.cpp:2314
+#: src/client.cpp:2299 src/client.cpp:2316
#, 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."
#. TRANSLATORS: error message question
-#: src/client.cpp:2978
+#: src/client.cpp:3000
msgid "Do you want to open support page?"
msgstr "¿Quieres abrir la página de soporte?"
@@ -705,36 +705,36 @@ msgstr "Comando desconocido."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr "Por favor, especifique un nombre."
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr "¡Jugador ya es %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr "¡Relación cambiada exitosamente! El jugador ahora es %s"
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr "¡Jugador no pudo ser %s!"
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "¡No se pueden enviar susurros vacíos!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -745,167 +745,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr "Caché limpiada"
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Falta el nombre del grupo."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr "Falta el nombre del gremio."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "Volver a alternar el chat."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "Mensaje cierra la charla."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "Volver ahora a cambiar de chat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Mensaje ahora cierra el chat."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "amigo"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr "desatendido"
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr "neutral"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr "¡El jugador no era ignorado!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr "¡El jugador ya no es ignorado!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr "¡Al jugador no se le puede dejar de ignorar!"
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr "en la lista negra"
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr "enemigo"
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr "¡Jugador ya borrado!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr "¡Jugador borrado con éxito!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr "¡Jugador no pudo ser borrado!"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:906 src/commands.cpp:962
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr "Tiempo de actividad del cliente: %s"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr "%d semanas"
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr "%d semanas"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr "%d días"
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr "%d días"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr "%d horas"
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr "%d horas"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr "%d minutos"
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr "%d minutos"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr "%d segundos"
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr "%d segundos"
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1116
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr "Variables de entorno vaciadas"
+#: src/commands.cpp:1342
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1349
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1356
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1380 src/commands.cpp:1389
+#: src/commands.cpp:1476 src/commands.cpp:1485
msgid "Resource images:"
msgstr "Imágenes de recurso:"
#. TRANSLATORS: dump command
-#: src/commands.cpp:1383 src/commands.cpp:1392
+#: src/commands.cpp:1479 src/commands.cpp:1488
msgid "Resource orphaned images:"
msgstr "Imágenes de recurso huérfano:"
@@ -942,23 +954,23 @@ msgid "Debug"
msgstr "Depurador"
#. TRANSLATORS: save file message
-#: src/game.cpp:573
+#: src/game.cpp:572
#, c-format
msgid "Screenshot saved as %s"
msgstr "Captura de pantalla guardada como %s"
#. TRANSLATORS: save file message
-#: src/game.cpp:583
+#: src/game.cpp:582
msgid "Saving screenshot failed!"
msgstr "¡El guardado de la captura de pantalla ha fallado!"
#. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
msgid "The connection to the server was lost."
msgstr "Se ha perdido la conexión con el servidor."
#. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
msgid "Network Error"
msgstr "Error de Red"
@@ -1072,7 +1084,7 @@ msgstr "Eliminar"
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
-#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1912 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "Mover"
@@ -1184,7 +1196,7 @@ msgstr "Agregar nombre al chat"
#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1797
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1266,7 +1278,7 @@ msgstr "Mover cámara"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1418,7 +1430,7 @@ msgstr "Agregar todo al intercambio"
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Almacenar"
@@ -1483,7 +1495,7 @@ msgstr "Recuperar todo"
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Usar"
@@ -1674,9 +1686,9 @@ msgstr "Proteger artículo"
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:680
+#: src/gui/windows/inventorywindow.cpp:682
msgid "Unequip"
msgstr "Quitárselo"
@@ -1685,7 +1697,7 @@ msgstr "Quitárselo"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Equipar"
@@ -1693,7 +1705,7 @@ msgstr "Equipar"
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:788
+#: src/gui/windows/inventorywindow.cpp:790
msgid "Drop..."
msgstr "Tirar..."
@@ -1708,7 +1720,7 @@ msgstr "Tirar todo"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:793
+#: src/gui/windows/inventorywindow.cpp:795
msgid "Drop"
msgstr "Tirar"
@@ -1797,8 +1809,9 @@ msgstr "Moverse al punto de navegación"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "Detener el ataque"
+#, fuzzy
+msgid "Stop Attack / Modifier key"
+msgstr "Teclas de atajo modificadoras"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:105
@@ -2313,100 +2326,95 @@ msgstr "Intercambiar el modo de cámara"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr "Tecla modificadora"
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
msgid "Show onscreen keyboard"
msgstr "Mostrar teclado en pantalla"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
msgid "Move Keys"
msgstr "Teclas de movimiento"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
msgid "Move Up"
msgstr "Moverse hacia arriba"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
msgid "Move Down"
msgstr "Moverse hacia abajo"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
msgid "Move Left"
msgstr "Moverse a la izquierda"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
msgid "Move Right"
msgstr "Moverse a la derecha"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
msgid "Move Forward"
msgstr "Muévase adelante"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
msgid "Move to navigation point shortcuts"
msgstr "Teclas de atajo para moverse al punto de navegacion"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1440
-#: src/gui/setupactiondata.h:1446 src/gui/setupactiondata.h:1452
-#: src/gui/setupactiondata.h:1458 src/gui/setupactiondata.h:1464
-#: src/gui/setupactiondata.h:1470 src/gui/setupactiondata.h:1476
-#: src/gui/setupactiondata.h:1482 src/gui/setupactiondata.h:1488
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: src/gui/setupactiondata.h:1686 src/gui/setupactiondata.h:1692
-#: src/gui/setupactiondata.h:1698 src/gui/setupactiondata.h:1704
-#: src/gui/setupactiondata.h:1710 src/gui/setupactiondata.h:1716
+#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1434
+#: src/gui/setupactiondata.h:1440 src/gui/setupactiondata.h:1446
+#: src/gui/setupactiondata.h:1452 src/gui/setupactiondata.h:1458
+#: src/gui/setupactiondata.h:1464 src/gui/setupactiondata.h:1470
+#: src/gui/setupactiondata.h:1476 src/gui/setupactiondata.h:1482
+#: src/gui/setupactiondata.h:1488 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 src/gui/setupactiondata.h:1686
+#: src/gui/setupactiondata.h:1692 src/gui/setupactiondata.h:1698
+#: src/gui/setupactiondata.h:1704 src/gui/setupactiondata.h:1710
#, c-format
msgid "Move to point Shortcut %d"
msgstr "Moverse a punto de atajo %d"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
msgid "Move & selection"
msgstr "Mover y seleccionar"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
msgid "Move Home"
msgstr "Moverse a Home"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
msgid "Move End"
msgstr "Moverse a End"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
msgid "Page up"
msgstr "Page up"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
msgid "Page down"
msgstr "Page down"
@@ -2415,23 +2423,23 @@ msgstr "Page down"
#. TRANSLATORS: settings group
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1785 src/gui/setupactiondata.h:1930
+#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
msgstr "Otro"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
msgid "Select"
msgstr "Select"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
msgid "Select2"
msgstr "Select2"
@@ -2441,7 +2449,7 @@ msgstr "Select2"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1809 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
#: src/gui/windows/charselectdialog.cpp:106
#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
#: src/gui/windows/shopwindow.cpp:100
@@ -2450,45 +2458,45 @@ msgid "Delete"
msgstr "Borrar"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
msgid "Backspace"
msgstr "Backspace"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
msgid "Insert"
msgstr "Insert"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
msgid "Tab"
msgstr "Tab"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
msgid "Mod"
msgstr "Mod"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
msgid "Ctrl"
msgstr "Ctrl"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
msgid "Basic"
msgstr "Basico"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1920 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
msgid "Shortcuts"
msgstr "Atajos"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
#: src/gui/windowmenu.cpp:161
msgid "Windows"
msgstr "Ventanas"
@@ -2496,7 +2504,7 @@ msgstr "Ventanas"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: emotes window name
#. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1924 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
#: src/gui/windows/emotewindow.cpp:107
msgid "Emotes"
msgstr "Emotes"
@@ -2504,13 +2512,13 @@ msgstr "Emotes"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1928 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
msgid "Chat"
msgstr "Chat"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
msgid "Gui"
msgstr "Interfaz"
@@ -2587,7 +2595,7 @@ msgstr "Miembros del gremio"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Efectos de partículas"
@@ -2721,14 +2729,14 @@ msgstr "Punto de recorrido"
msgid "Tiles border"
msgstr "Borde de tiles"
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr "Nivel: %u"
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
-#: src/gui/windows/inventorywindow.cpp:598
+#: src/gui/widgets/characterdisplay.cpp:136
+#: src/gui/windows/inventorywindow.cpp:600
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2807,7 +2815,7 @@ msgstr "Abrir url"
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:339 src/gui/widgets/setupitem.cpp:475
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr "Editar"
@@ -3473,14 +3481,14 @@ msgstr "predeterminado"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "bajo"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "medio"
@@ -3494,7 +3502,7 @@ msgstr "tv"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "alto"
@@ -3853,9 +3861,8 @@ msgstr "Usar FBO para capturas de pantalla (sólo para opengl)"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:376
-#, fuzzy
msgid "Screenshot directory"
-msgstr "Capturar pantalla"
+msgstr "Directorio de capturas de pantalla"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:381
@@ -4380,8 +4387,8 @@ msgstr "Tema cambiado"
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:499
+#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "Reinicia el cliente para que los cambios surtan efecto."
@@ -4468,59 +4475,59 @@ msgid "Button %u action"
msgstr "Acción del botón %u"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:190
msgid "Full screen"
msgstr "Pantalla completa"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
msgid "FPS limit:"
msgstr "Límite de FPS:"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:194
-#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:198
+#: src/gui/widgets/tabs/setup_video.cpp:240
+#: src/gui/widgets/tabs/setup_video.cpp:429
+#: src/gui/widgets/tabs/setup_video.cpp:557
msgid "Alt FPS limit: "
msgstr "Límite alternativo de FPS: "
#. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:197
+#: src/gui/widgets/tabs/setup_video.cpp:201
msgid "Detect best mode"
msgstr "Detectar el mejor modo"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:210
msgid "Show cursor"
msgstr "Mostrar cursor"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:213
msgid "Custom cursor"
msgstr "Cursor personalizado"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:217
msgid "Enable resize"
msgstr "Permitir cambio de tamaño"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:220
msgid "No frame"
msgstr "Sin marco"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:241
+#: src/gui/widgets/tabs/setup_video.cpp:427
+#: src/gui/widgets/tabs/setup_video.cpp:541
+#: src/gui/widgets/tabs/setup_video.cpp:554
msgid "None"
msgstr "Nada"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:349
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
@@ -4528,7 +4535,7 @@ msgstr ""
"también falló!"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:356
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
@@ -4536,42 +4543,42 @@ msgstr ""
"modo anterior también falló!"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:368
msgid "Switching to Full Screen"
msgstr "Cambiando a pantalla completa"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:370
msgid "Restart needed for changes to take effect."
msgstr "Reinicio necesario para que los cambios surtan efecto."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:388
msgid "Changing to OpenGL"
msgstr "Cambiando a OpenGL"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:390
msgid "Applying change to OpenGL requires restart."
msgstr "Se necesita reiniciar para aplicar el cambio a OpenGL."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:468
msgid "Custom resolution (example: 1024x768)"
msgstr "Resolución personalizada (ejemplo: 1024x768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:470
msgid "Enter new resolution: "
msgstr "Ingrese la nueva resolución: "
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:497
+#: src/gui/widgets/tabs/setup_video.cpp:506
msgid "Screen Resolution Changed"
msgstr "Resolución de pantalla cambiada"
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:500
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Algunas ventanas pueden ser movidas para adaptarlas a la resolución más baja."
@@ -4624,93 +4631,102 @@ msgid "on"
msgstr "on"
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr "Visual"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr "Notificaciones"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr "Mostrar notificaciones en el chat al recoger"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr "Mostrar notificaciones como efecto de partículas al recoger"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr "Efectos"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr "Sostener el enfoque del teclado y el ratón dentro de la ventana"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr "Texturas Borrosas (OpenGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Opacidad de interfaz"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "Sobrecarga de texto"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Efectos de ambiente"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "máximo"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr "Detalle de partícula"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr "Particle physics"
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr "Gamma"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr "Habilitar control gamma"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr "Vsync"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr "Centrar ventana del juego"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr "Permitir ejecución de protector de pantalla"
@@ -4829,7 +4845,7 @@ msgstr "EQU"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
#: src/gui/windows/inventorywindow.cpp:228
msgid "Equipment"
msgstr "Equipamiento"
@@ -5359,7 +5375,7 @@ msgid "Whispering to %s: %s"
msgstr "Susurrando a %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1607
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr "Mascota de %s"
@@ -6117,12 +6133,12 @@ msgid "Error retreiving server list!"
msgstr "¡Error al recuperar la lista de servidores!"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:638
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr "requiere una versión más nueva"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:643
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr "requiere v%s"
@@ -8027,3 +8043,9 @@ msgstr "Elemento desconocido"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr "mascota"
+
+#~ msgid "Stop Attack"
+#~ msgstr "Detener el ataque"
+
+#~ msgid "Modifier key"
+#~ msgstr "Tecla modificadora"
diff --git a/po/et.po b/po/et.po
index 872c67ad6..ccbb5a77d 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Estonian (http://www.transifex.com/projects/p/manaplus/language/et/)\n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr ""
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr ""
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -497,8 +497,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -525,31 +525,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Abi"
@@ -562,7 +562,7 @@ msgstr "Abi"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -571,32 +571,32 @@ msgid "Close"
msgstr "Sulge"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -611,7 +611,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -624,65 +624,65 @@ msgid "Error"
msgstr "Viga"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -695,36 +695,36 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr ""
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -733,167 +733,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr ""
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -916,36 +928,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr ""
@@ -982,7 +994,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr ""
@@ -997,7 +1009,7 @@ msgstr ""
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1005,34 +1017,34 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1057,8 +1069,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1078,7 +1090,7 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1091,7 +1103,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1101,8 +1113,8 @@ msgstr ""
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1128,7 +1140,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1136,7 +1148,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1159,19 +1171,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1184,44 +1196,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1231,20 +1243,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1253,7 +1265,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1261,69 +1273,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1333,68 +1345,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1403,64 +1415,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1468,42 +1480,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1512,13 +1524,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1526,134 +1538,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1661,7 +1673,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1671,7 +1683,7 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
@@ -1679,14 +1691,14 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1694,7 +1706,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr ""
@@ -1702,48 +1714,48 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2406,7 +2418,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2574,7 +2586,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr ""
@@ -2708,13 +2720,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2794,7 +2806,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3403,12 +3415,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3457,14 +3469,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr ""
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr ""
@@ -3478,7 +3490,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr ""
@@ -3833,17 +3845,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4353,8 +4370,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr ""
@@ -4453,8 +4470,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4486,61 +4503,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4592,93 +4609,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr ""
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr ""
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5234,7 +5260,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr ""
@@ -5317,7 +5343,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6051,33 +6077,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6639,36 +6665,36 @@ msgid "Name: %s"
msgstr "Nimi: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr ""
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr ""
@@ -6715,25 +6741,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6741,7 +6767,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7918,43 +7944,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr ""
diff --git a/po/fa.po b/po/fa.po
index d73130425..805582148 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/manaplus/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr ""
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr ""
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -496,8 +496,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -524,31 +524,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr ""
@@ -561,7 +561,7 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -570,32 +570,32 @@ msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -610,7 +610,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -623,65 +623,65 @@ msgid "Error"
msgstr "خطا"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -694,36 +694,36 @@ msgstr "چنین دستور وجود ندارد"
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr ""
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -732,167 +732,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr ""
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -915,36 +927,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr "کلی"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr "خطای شبکه"
@@ -981,7 +993,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr ""
@@ -996,7 +1008,7 @@ msgstr ""
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1004,34 +1016,34 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1056,8 +1068,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1077,7 +1089,7 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1090,7 +1102,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1100,8 +1112,8 @@ msgstr ""
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1135,7 +1147,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1158,19 +1170,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1183,44 +1195,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "انصراÙ"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1230,20 +1242,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1252,7 +1264,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1260,69 +1272,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1332,68 +1344,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1402,64 +1414,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1467,42 +1479,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1511,13 +1523,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1525,134 +1537,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1660,7 +1672,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1670,7 +1682,7 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
@@ -1678,14 +1690,14 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1693,7 +1705,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr ""
@@ -1701,48 +1713,48 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2405,7 +2417,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2573,7 +2585,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr ""
@@ -2707,13 +2719,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2793,7 +2805,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3402,12 +3414,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3456,14 +3468,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr ""
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr ""
@@ -3477,7 +3489,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr ""
@@ -3832,17 +3844,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4352,8 +4369,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr ""
@@ -4452,8 +4469,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4485,61 +4502,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4591,93 +4608,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr ""
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr ""
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5233,7 +5259,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr ""
@@ -5316,7 +5342,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6048,33 +6074,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6636,36 +6662,36 @@ msgid "Name: %s"
msgstr ""
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr "در حال اتصال..."
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr ""
@@ -6712,25 +6738,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6738,7 +6764,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7915,43 +7941,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index c59f1f3da..b4bec3ddc 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: 2014-01-18 12:47+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
"language/fi/)\n"
@@ -36,25 +36,25 @@ msgid "Visible on map"
msgstr "Näkyvillä kartalla"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:327
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "väistö"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "miss"
msgstr "huti"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1933 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "P"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1938 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "-"
@@ -527,31 +527,31 @@ msgstr "Leijuva puhekupla"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1136 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Asetukset"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Kuva"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr "Teema"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1149 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Apua"
@@ -564,7 +564,7 @@ msgstr "Apua"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1153 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -573,32 +573,32 @@ msgid "Close"
msgstr "Sulje"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1278
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Yhdistän palvelimeen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Kirjaudun sisään"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1364
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Siirryn pelimaailmaan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1489
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "Pyydän hahmoja"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1529
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "Yhdistän pelipalvelimeen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1542
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "Vaihdan pelipalvelinta"
@@ -613,7 +613,7 @@ msgstr "Vaihdan pelipalvelinta"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1603 src/client.cpp:1614 src/client.cpp:1798
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -626,65 +626,65 @@ msgid "Error"
msgstr "Virhe"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1626
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "Pyydän rekisteröitymisen yksityiskohtia"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1667
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "Salasanan vaihto"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1669
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "Salasana vaihdettu onnistuneesti!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1691
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "Sähköpostin vaihto"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1693
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1716
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "Tietojen poisto onnistui"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1718
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "Näkemisiin, tule pian takaisin..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1995 src/client.cpp:2010 src/client.cpp:2055
-#: src/client.cpp:2071 src/client.cpp:2520 src/client.cpp:2528
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2227
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2268 src/client.cpp:2275
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
-#: src/client.cpp:2297 src/client.cpp:2314
+#: src/client.cpp:2299 src/client.cpp:2316
#, 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."
#. TRANSLATORS: error message question
-#: src/client.cpp:2978
+#: src/client.cpp:3000
msgid "Do you want to open support page?"
msgstr ""
@@ -697,36 +697,36 @@ msgstr "Tuntematon komento."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr "Anna nimi."
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr "Pelaaja on jo %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr "Pelaaja on nyt %s."
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!"
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Et voi lähettää tyhjiä kuiskauksia!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -737,167 +737,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Ryhmän nimi puuttuu."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr "Killan nimi puuttuu."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "Viesti sulkee keskustelun."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Nyt viesti sulkee keskustelun."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "ystävä"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr "vaimennettu"
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr "neutraali"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr "Pelaajaa ei ollut jätetty huomiotta!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr "Pelaaja huomioidaan taas."
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr "Pelaajan uudelleenhuomiointi epäonnistui."
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr "mustalistattu"
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr "vihollinen"
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr "Pelaaja on jo pyyhitty!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr "Pelaaja pyyhitty."
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty."
#. TRANSLATORS: uptime command
-#: src/commands.cpp:906 src/commands.cpp:962
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr "Ohjelma ollut käynnissä: %s"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr "%d viikkoa"
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr "%d päivää"
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr "%d tuntia"
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr "%d minuuttia"
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr "%d sekuntia"
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1116
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1342
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1349
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1356
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1380 src/commands.cpp:1389
+#: src/commands.cpp:1476 src/commands.cpp:1485
msgid "Resource images:"
msgstr "Resurssikuvat:"
#. TRANSLATORS: dump command
-#: src/commands.cpp:1383 src/commands.cpp:1392
+#: src/commands.cpp:1479 src/commands.cpp:1488
msgid "Resource orphaned images:"
msgstr "Orvot resurssikuvat:"
@@ -935,23 +947,23 @@ msgid "Debug"
msgstr "Debug"
#. TRANSLATORS: save file message
-#: src/game.cpp:573
+#: src/game.cpp:572
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:583
+#: src/game.cpp:582
msgid "Saving screenshot failed!"
msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
#. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
msgid "The connection to the server was lost."
msgstr "Yhteys palvelimeen katkesi."
#. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
msgid "Network Error"
msgstr "Verkkovirhe"
@@ -1065,7 +1077,7 @@ msgstr "Pommita"
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
-#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1912 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "Liiku"
@@ -1177,7 +1189,7 @@ msgstr "Lisää nimi keskusteluun"
#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1797
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1259,7 +1271,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1411,7 +1423,7 @@ msgstr "Lisää kaikki kauppaan"
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Varastoi"
@@ -1476,7 +1488,7 @@ msgstr "Ota kaikki"
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Käytä"
@@ -1667,9 +1679,9 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:680
+#: src/gui/windows/inventorywindow.cpp:682
msgid "Unequip"
msgstr "Poista varuste käytöstä"
@@ -1678,7 +1690,7 @@ msgstr "Poista varuste käytöstä"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Ota käyttöön"
@@ -1686,7 +1698,7 @@ msgstr "Ota käyttöön"
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:788
+#: src/gui/windows/inventorywindow.cpp:790
msgid "Drop..."
msgstr "Pudota..."
@@ -1701,7 +1713,7 @@ msgstr "Pudota kaikki"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:793
+#: src/gui/windows/inventorywindow.cpp:795
msgid "Drop"
msgstr "Pudota"
@@ -1790,8 +1802,9 @@ msgstr "Siirry reittipisteeseen"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "Keskeytä hyökkäys"
+#, fuzzy
+msgid "Stop Attack / Modifier key"
+msgstr "Muokkausnäppäin"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:105
@@ -2306,100 +2319,95 @@ msgstr "Vaihda kameran toimintaa"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr "Muokkausnäppäin"
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
msgid "Show onscreen keyboard"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
msgid "Move Keys"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
msgid "Move Up"
msgstr "Ylöspäin"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
msgid "Move Down"
msgstr "Alaspäin"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
msgid "Move Left"
msgstr "Vasemmalle"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
msgid "Move Right"
msgstr "Oikealle"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
msgid "Move Forward"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
msgid "Move to navigation point shortcuts"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1440
-#: src/gui/setupactiondata.h:1446 src/gui/setupactiondata.h:1452
-#: src/gui/setupactiondata.h:1458 src/gui/setupactiondata.h:1464
-#: src/gui/setupactiondata.h:1470 src/gui/setupactiondata.h:1476
-#: src/gui/setupactiondata.h:1482 src/gui/setupactiondata.h:1488
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: src/gui/setupactiondata.h:1686 src/gui/setupactiondata.h:1692
-#: src/gui/setupactiondata.h:1698 src/gui/setupactiondata.h:1704
-#: src/gui/setupactiondata.h:1710 src/gui/setupactiondata.h:1716
+#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1434
+#: src/gui/setupactiondata.h:1440 src/gui/setupactiondata.h:1446
+#: src/gui/setupactiondata.h:1452 src/gui/setupactiondata.h:1458
+#: src/gui/setupactiondata.h:1464 src/gui/setupactiondata.h:1470
+#: src/gui/setupactiondata.h:1476 src/gui/setupactiondata.h:1482
+#: src/gui/setupactiondata.h:1488 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 src/gui/setupactiondata.h:1686
+#: src/gui/setupactiondata.h:1692 src/gui/setupactiondata.h:1698
+#: src/gui/setupactiondata.h:1704 src/gui/setupactiondata.h:1710
#, c-format
msgid "Move to point Shortcut %d"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
msgid "Move & selection"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
msgid "Move Home"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
msgid "Move End"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
msgid "Page up"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
msgid "Page down"
msgstr ""
@@ -2408,23 +2416,23 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1785 src/gui/setupactiondata.h:1930
+#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
msgstr "Muu"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
msgid "Select"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
msgid "Select2"
msgstr ""
@@ -2434,7 +2442,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1809 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
#: src/gui/windows/charselectdialog.cpp:106
#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
#: src/gui/windows/shopwindow.cpp:100
@@ -2443,45 +2451,45 @@ msgid "Delete"
msgstr "Poista"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
msgid "Backspace"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
msgid "Insert"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
msgid "Tab"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
msgid "Mod"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
msgid "Ctrl"
msgstr ""
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
msgid "Basic"
msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1920 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
msgid "Shortcuts"
msgstr "Pikavalinnat"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
#: src/gui/windowmenu.cpp:161
msgid "Windows"
msgstr ""
@@ -2489,7 +2497,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: emotes window name
#. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1924 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
#: src/gui/windows/emotewindow.cpp:107
msgid "Emotes"
msgstr ""
@@ -2497,13 +2505,13 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1928 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
msgid "Chat"
msgstr "Keskustelu"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
msgid "Gui"
msgstr ""
@@ -2580,7 +2588,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Hiukkastehosteet"
@@ -2714,14 +2722,14 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
-#: src/gui/windows/inventorywindow.cpp:598
+#: src/gui/widgets/characterdisplay.cpp:136
+#: src/gui/windows/inventorywindow.cpp:600
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2800,7 +2808,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:339 src/gui/widgets/setupitem.cpp:475
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr "Muokkaa"
@@ -3465,14 +3473,14 @@ msgstr "oletus"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "matala"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "keskitaso"
@@ -3486,7 +3494,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "korkea"
@@ -3842,9 +3850,8 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:376
-#, fuzzy
msgid "Screenshot directory"
-msgstr "Kuvankaappaus"
+msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:381
@@ -4367,8 +4374,8 @@ msgstr "Ulkoasua muutettu"
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:499
+#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
@@ -4455,106 +4462,106 @@ msgid "Button %u action"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:190
msgid "Full screen"
msgstr "Kokoruututila"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
msgid "FPS limit:"
msgstr "Piirtonopeusrajoitin (FPS):"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:194
-#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:198
+#: src/gui/widgets/tabs/setup_video.cpp:240
+#: src/gui/widgets/tabs/setup_video.cpp:429
+#: src/gui/widgets/tabs/setup_video.cpp:557
msgid "Alt FPS limit: "
msgstr "Vaihtoehtoinen FPS-rajoitin:"
#. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:197
+#: src/gui/widgets/tabs/setup_video.cpp:201
msgid "Detect best mode"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:210
msgid "Show cursor"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:213
msgid "Custom cursor"
msgstr "Tyylitelty hiiren osoitin"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:217
msgid "Enable resize"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:220
msgid "No frame"
msgstr ""
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:241
+#: src/gui/widgets/tabs/setup_video.cpp:427
+#: src/gui/widgets/tabs/setup_video.cpp:541
+#: src/gui/widgets/tabs/setup_video.cpp:554
msgid "None"
msgstr "-"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:349
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr "Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:356
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr "Kokoruututilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:368
msgid "Switching to Full Screen"
msgstr "Vaihdan kokoruututilaan"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:370
msgid "Restart needed for changes to take effect."
msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:388
msgid "Changing to OpenGL"
msgstr "Vaihdetaan käyttämään OpenGL:ää"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:390
msgid "Applying change to OpenGL requires restart."
msgstr "OpenGL -asetuksen muutos vaatii ohjelman uudelleenkäynnistyksen."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:468
msgid "Custom resolution (example: 1024x768)"
msgstr "Oma tarkkuus (esim. 1024x768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:470
msgid "Enter new resolution: "
msgstr "Anna uusi tarkkuus: "
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:497
+#: src/gui/widgets/tabs/setup_video.cpp:506
msgid "Screen Resolution Changed"
msgstr "Ikkunan koko vaihdettu"
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:500
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
@@ -4607,93 +4614,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Käyttöliittymän läpinäkyvyys"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "Tekstinä yläpuolella"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Taustaäänet"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "maksimi"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr "Hiukkastehosteiden yksityiskohtaisuus"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -4813,7 +4829,7 @@ msgstr "Var"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
#: src/gui/windows/inventorywindow.cpp:228
msgid "Equipment"
msgstr "Varusteet"
@@ -5334,7 +5350,7 @@ msgid "Whispering to %s: %s"
msgstr "Kuiskaat pelaajalle %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1607
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6089,12 +6105,12 @@ msgid "Error retreiving server list!"
msgstr "Palvelinluettelon hakeminen epäonnistui!"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:638
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr "vaatii uudemman version"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:643
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr "vaatii version %s"
@@ -7987,3 +8003,6 @@ msgstr "Tuntematon tavara"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
+
+#~ msgid "Stop Attack"
+#~ msgstr "Keskeytä hyökkäys"
diff --git a/po/fr.po b/po/fr.po
index fe6720f37..0530c8ef7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-01-18 12:47+0300\n"
-"PO-Revision-Date: 2014-01-13 03:53+0000\n"
-"Last-Translator: Alige <aligetmw@hotmail.fr>\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
"fr/)\n"
"Language: fr\n"
@@ -43,25 +43,25 @@ msgid "Visible on map"
msgstr "Visible sur la carte"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:327
+#: src/being/being.cpp:329
msgid "Human"
msgstr "Humain"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "esquive"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "miss"
msgstr "raté"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1933 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1938 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "I"
@@ -534,31 +534,31 @@ msgstr "Bulle flottante"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1136 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Configuration"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr "Performance"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Vidéo"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr "Thème"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1149 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Aide"
@@ -571,7 +571,7 @@ msgstr "Aide"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1153 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -580,32 +580,32 @@ msgid "Close"
msgstr "Fermer"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1278
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Connexion au serveur"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Connexion"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1364
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Entrée dans le monde de jeu"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1489
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "Téléchargement des personnages"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1529
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "Connexion au serveur de jeu"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1542
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "Changement de serveur de jeu"
@@ -620,7 +620,7 @@ msgstr "Changement de serveur de jeu"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1603 src/client.cpp:1614 src/client.cpp:1798
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -633,66 +633,66 @@ msgid "Error"
msgstr "Erreur"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1626
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "Demande des paramètres d'inscription"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1667
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "Changement de mot de passe"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1669
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "Le mot de passe a été changé avec succès !"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1691
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "Changer d'e-mail"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1693
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "L'adresse e-mail a été changée avec succès !"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1716
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "Désinscription réussie"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1718
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "À bientôt, Revenez quand vous voulez..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1995 src/client.cpp:2010 src/client.cpp:2055
-#: src/client.cpp:2071 src/client.cpp:2520 src/client.cpp:2528
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
#, 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."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2227
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr "Hôte de mise à jour invalide : %s"
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2268 src/client.cpp:2275
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Impossible de créer le dossier de mise à jour !"
-#: src/client.cpp:2297 src/client.cpp:2314
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
"Erreur : %s n'existe pas et ne peut pas être créé ! Fermeture du programme."
#. TRANSLATORS: error message question
-#: src/client.cpp:2978
+#: src/client.cpp:3000
msgid "Do you want to open support page?"
msgstr "Veux-tu ouvrir la page d'aide ?"
@@ -705,36 +705,36 @@ msgstr "Commande inconnue."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr "Indiques un nom."
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr "Joueur déjà %s !"
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr "Joueur %s avec succès !"
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr "Le joueur n'a pas pu %s !"
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Vous ne pouvez pas envoyer de messages vides."
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -745,168 +745,180 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr "Cache nettoyé"
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Le nom du groupe est manquant."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr "Le nom de la guilde est manquant."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "La touche <entrée> ferme la ligne d'entrée du chat."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "Le message ferme la conversation."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr ""
"La touche <Entrée> ferme maintenant la ligne d'entrée de la conversation."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Le message ferme maintenant la conversation."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "ami"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr "écarté"
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr "neutre"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr "Le joueur n'était pas ignoré !"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr "Le joueur n'est plus ignoré !"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr "Vous n'avez pas pu enlever le statut ignoré de ce joueur !"
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr "sous liste noire"
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr "ennemi"
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr "Joueur déjà effacé !"
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr "Joueur éliminé avec succès !"
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr "Le joueur n'a pas pu être effacé !"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:906 src/commands.cpp:962
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr "Heure de lancement du client : %s"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr "%d semaines"
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr "%d semaines"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr "%d jours"
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr "%d jours"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr "%d heures"
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr "%d heures"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr "%d minutes"
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr "%d minutes"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr "%d secondes"
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr "%d secondes"
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1116
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr "Variables d'environnement effacées"
+#: src/commands.cpp:1342
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1349
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1356
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1380 src/commands.cpp:1389
+#: src/commands.cpp:1476 src/commands.cpp:1485
msgid "Resource images:"
msgstr "Images des ressources :"
#. TRANSLATORS: dump command
-#: src/commands.cpp:1383 src/commands.cpp:1392
+#: src/commands.cpp:1479 src/commands.cpp:1488
msgid "Resource orphaned images:"
msgstr "Images des ressources non affectées :"
@@ -943,24 +955,24 @@ msgid "Debug"
msgstr "Débogage"
#. TRANSLATORS: save file message
-#: src/game.cpp:573
+#: src/game.cpp:572
#, c-format
msgid "Screenshot saved as %s"
msgstr "Capture d'écran sauvegardée sous %s"
#. TRANSLATORS: save file message
-#: src/game.cpp:583
+#: src/game.cpp:582
msgid "Saving screenshot failed!"
msgstr "La capture d'écran a échoué !"
#. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
msgid "The connection to the server was lost."
msgstr ""
"La connexion au serveur a été coupée, le programme va maintenant se fermer."
#. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
msgid "Network Error"
msgstr "Erreur Réseau"
@@ -1074,7 +1086,7 @@ msgstr "Annihiler"
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
-#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1912 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "Déplacement"
@@ -1186,7 +1198,7 @@ msgstr "Ajouter le nom dans la boite de dialogue"
#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1797
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1268,7 +1280,7 @@ msgstr "Bouger la caméra"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1420,7 +1432,7 @@ msgstr "Ajouter tout dans l'échange"
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Entreposer"
@@ -1485,7 +1497,7 @@ msgstr "Reprendre tout"
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Utiliser"
@@ -1676,9 +1688,9 @@ msgstr "Objet protégé"
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:680
+#: src/gui/windows/inventorywindow.cpp:682
msgid "Unequip"
msgstr "Retirer"
@@ -1687,7 +1699,7 @@ msgstr "Retirer"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Équiper"
@@ -1695,7 +1707,7 @@ msgstr "Équiper"
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:788
+#: src/gui/windows/inventorywindow.cpp:790
msgid "Drop..."
msgstr "Jeter..."
@@ -1710,7 +1722,7 @@ msgstr "Jeter tout"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:793
+#: src/gui/windows/inventorywindow.cpp:795
msgid "Drop"
msgstr "Jeter"
@@ -1799,8 +1811,9 @@ msgstr "Aller jusqu'au point de navigation"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "Arrêter d'attaquer"
+#, fuzzy
+msgid "Stop Attack / Modifier key"
+msgstr "Touches des modificateurs de raccourcis"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:105
@@ -2315,100 +2328,95 @@ msgstr "Changer le mode caméra"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr "Modifier la touche"
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
msgid "Show onscreen keyboard"
msgstr "Afficher le clavier d'écran"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
msgid "Move Keys"
msgstr "Touches de déplacement"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
msgid "Move Up"
msgstr "Monter"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
msgid "Move Down"
msgstr "Descendre"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
msgid "Move Left"
msgstr "Aller à gauche"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
msgid "Move Right"
msgstr "Aller à droite"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
msgid "Move Forward"
msgstr "Aller devant"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
msgid "Move to navigation point shortcuts"
msgstr "Raccourcis de \"Aller au point de navigation\""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1440
-#: src/gui/setupactiondata.h:1446 src/gui/setupactiondata.h:1452
-#: src/gui/setupactiondata.h:1458 src/gui/setupactiondata.h:1464
-#: src/gui/setupactiondata.h:1470 src/gui/setupactiondata.h:1476
-#: src/gui/setupactiondata.h:1482 src/gui/setupactiondata.h:1488
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: src/gui/setupactiondata.h:1686 src/gui/setupactiondata.h:1692
-#: src/gui/setupactiondata.h:1698 src/gui/setupactiondata.h:1704
-#: src/gui/setupactiondata.h:1710 src/gui/setupactiondata.h:1716
+#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1434
+#: src/gui/setupactiondata.h:1440 src/gui/setupactiondata.h:1446
+#: src/gui/setupactiondata.h:1452 src/gui/setupactiondata.h:1458
+#: src/gui/setupactiondata.h:1464 src/gui/setupactiondata.h:1470
+#: src/gui/setupactiondata.h:1476 src/gui/setupactiondata.h:1482
+#: src/gui/setupactiondata.h:1488 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 src/gui/setupactiondata.h:1686
+#: src/gui/setupactiondata.h:1692 src/gui/setupactiondata.h:1698
+#: src/gui/setupactiondata.h:1704 src/gui/setupactiondata.h:1710
#, c-format
msgid "Move to point Shortcut %d"
msgstr "Raccourci de \"Aller au point de navigation\" %d"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
msgid "Move & selection"
msgstr "Déplacement & sélection"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
msgid "Move Home"
msgstr "Aller au point de repos"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
msgid "Move End"
msgstr "Arrêt du déplacement"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
msgid "Page up"
msgstr "Page précédente"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
msgid "Page down"
msgstr "Page suivante"
@@ -2417,23 +2425,23 @@ msgstr "Page suivante"
#. TRANSLATORS: settings group
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1785 src/gui/setupactiondata.h:1930
+#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
msgstr "Autre"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
msgid "Select"
msgstr "Sélectionner"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
msgid "Select2"
msgstr "Sélectionner2"
@@ -2443,7 +2451,7 @@ msgstr "Sélectionner2"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1809 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
#: src/gui/windows/charselectdialog.cpp:106
#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
#: src/gui/windows/shopwindow.cpp:100
@@ -2452,45 +2460,45 @@ msgid "Delete"
msgstr "Supprimer"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
msgid "Backspace"
msgstr "Retour arrière"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
msgid "Insert"
msgstr "Insérer"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
msgid "Tab"
msgstr "Tab"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
msgid "Mod"
msgstr "Modif."
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
msgid "Ctrl"
msgstr "Ctrl"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
msgid "Basic"
msgstr "Basique"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1920 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
msgid "Shortcuts"
msgstr "Raccourcis"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
#: src/gui/windowmenu.cpp:161
msgid "Windows"
msgstr "Fenêtres"
@@ -2498,7 +2506,7 @@ msgstr "Fenêtres"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: emotes window name
#. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1924 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
#: src/gui/windows/emotewindow.cpp:107
msgid "Emotes"
msgstr "Emoticônes"
@@ -2506,13 +2514,13 @@ msgstr "Emoticônes"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1928 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
msgid "Chat"
msgstr "Conversation"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
msgid "Gui"
msgstr "Interface utilisateur (IU)"
@@ -2589,7 +2597,7 @@ msgstr "Membres de la guilde"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Effets de particules"
@@ -2723,14 +2731,14 @@ msgstr "Point de route"
msgid "Tiles border"
msgstr "Bord des tiles"
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr "Niveau : %u"
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
-#: src/gui/windows/inventorywindow.cpp:598
+#: src/gui/widgets/characterdisplay.cpp:136
+#: src/gui/windows/inventorywindow.cpp:600
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2809,7 +2817,7 @@ msgstr "Ouvrir l'adresse"
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:339 src/gui/widgets/setupitem.cpp:475
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr "Éditer"
@@ -3476,14 +3484,14 @@ msgstr "défaut"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "bas"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "moyen"
@@ -3497,7 +3505,7 @@ msgstr "tv"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "élevés"
@@ -3854,9 +3862,8 @@ msgstr "Utiliser FBO pour les captures d'écran (seulement pour OpenGL)"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:376
-#, fuzzy
msgid "Screenshot directory"
-msgstr "Capture d'écran"
+msgstr "Répertoire des captures d'écran"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:381
@@ -4384,8 +4391,8 @@ msgstr "Thème changé"
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:499
+#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "Redémarres le jeu pour que les changements soient appliqués."
@@ -4472,59 +4479,59 @@ msgid "Button %u action"
msgstr "Bouton d'action %u"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:190
msgid "Full screen"
msgstr "Plein écran"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
msgid "FPS limit:"
msgstr "Limite FPS :"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:194
-#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:198
+#: src/gui/widgets/tabs/setup_video.cpp:240
+#: src/gui/widgets/tabs/setup_video.cpp:429
+#: src/gui/widgets/tabs/setup_video.cpp:557
msgid "Alt FPS limit: "
msgstr "Limite FPS alternative :"
#. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:197
+#: src/gui/widgets/tabs/setup_video.cpp:201
msgid "Detect best mode"
msgstr "Détecter le meilleur mode"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:210
msgid "Show cursor"
msgstr "Afficher curseur"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:213
msgid "Custom cursor"
msgstr "Curseur personnalisé"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:217
msgid "Enable resize"
msgstr "Activer le redimensionnement"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:220
msgid "No frame"
msgstr "Pas d'image"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:241
+#: src/gui/widgets/tabs/setup_video.cpp:427
+#: src/gui/widgets/tabs/setup_video.cpp:541
+#: src/gui/widgets/tabs/setup_video.cpp:554
msgid "None"
msgstr "Aucun"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:349
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
@@ -4532,7 +4539,7 @@ msgstr ""
"également pas accessible !"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:356
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
@@ -4540,44 +4547,44 @@ msgstr ""
"également pas accessible !"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:368
msgid "Switching to Full Screen"
msgstr "Passage en plein écran"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:370
msgid "Restart needed for changes to take effect."
msgstr ""
"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:388
msgid "Changing to OpenGL"
msgstr "Activation d'OpenGL"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:390
msgid "Applying change to OpenGL requires restart."
msgstr ""
"Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:468
msgid "Custom resolution (example: 1024x768)"
msgstr "Résolution personnalisée (exemple : 1024x768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:470
msgid "Enter new resolution: "
msgstr "Entres la nouvelle résolution : "
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:497
+#: src/gui/widgets/tabs/setup_video.cpp:506
msgid "Screen Resolution Changed"
msgstr "Résolution de l'écran modifiée"
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:500
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Certaines fenêtres pourraient être modifiées pour coïncider à la résolution "
@@ -4631,93 +4638,102 @@ msgid "on"
msgstr "activé"
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr "Visuelle"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr "Notifications"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr "Montrer les notifications de ramassage dans la conversation"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr "Montrer les notifications de ramassage avec des effets de particule"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr "Effets"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr "Prends l'entrée de la souris et le clavier"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr "Textures floues (OpenGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Opacité de l'interface"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "Bulles de texte"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Effets ambiants"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "max."
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr "Détail des particules"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr "Physique des particules"
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr "Gamma"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr "Activer le contrôle de gamma"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr "Vsync"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr "Centrer la fenêtre de jeu"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr "Autoriser l'économiseur d'écran à fonctionner"
@@ -4836,7 +4852,7 @@ msgstr "Equ"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
#: src/gui/windows/inventorywindow.cpp:228
msgid "Equipment"
msgstr "Équipement"
@@ -5362,7 +5378,7 @@ msgid "Whispering to %s: %s"
msgstr "Message envoyé à %s : %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1607
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr "%s du familier"
@@ -6117,12 +6133,12 @@ msgid "Error retreiving server list!"
msgstr "Erreur lors du téléchargement de la liste de serveurs !"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:638
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr "requiert une nouvelle version"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:643
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr "requiert la v%s"
@@ -8037,3 +8053,9 @@ msgstr "Objet inconnu"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr "familier"
+
+#~ msgid "Stop Attack"
+#~ msgstr "Arrêter d'attaquer"
+
+#~ msgid "Modifier key"
+#~ msgstr "Modifier la touche"
diff --git a/po/he.po b/po/he.po
index f6535a5f8..9f886b91e 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/manaplus/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr "×ž×ª×¢×œ× ×ž×”×¦×¢×•×ª סחר נכנסות"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr "מ×שר הצעות סחר נכנסות"
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -497,8 +497,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -525,31 +525,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "הגדרות"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr "ויד×ו"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "עזרה"
@@ -562,7 +562,7 @@ msgstr "עזרה"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -571,32 +571,32 @@ msgid "Close"
msgstr "סגור"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -611,7 +611,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -624,65 +624,65 @@ msgid "Error"
msgstr "שגי××”"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "שגי××” ביצירת ספריית העדכוני×!"
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -695,36 +695,36 @@ msgstr "פקודה ×œ× ×ž×•×›×¨×ª."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "×œ× × ×™×ª×Ÿ לשלוח לחישות ריקות!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -733,167 +733,179 @@ msgstr "×œ× × ×™×ª×Ÿ ליצור לשונית לחישות עבור הכינוי
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "×©× ×—×‘×•×¨×” חסר."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "סגירת תיבת הטקסט ×”×וטומטית."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "ההודעה סוגרת ×ת תיבת הטקסט."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "מקש ×”×נטר כעת סוגר ×ת תיבת הטקסט."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "ההודעה כעת סוגרת ×ת תיבת הטקסט."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -916,36 +928,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr "כללי"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr "שמירת תמונת־מסך נכשלה"
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr "שגי×ת רשת"
@@ -982,7 +994,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr "סחרר"
@@ -997,7 +1009,7 @@ msgstr "סחרר"
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1005,34 +1017,34 @@ msgstr "תקוף"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1057,8 +1069,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1078,7 +1090,7 @@ msgstr "דבר"
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1091,7 +1103,7 @@ msgstr "קנה"
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1101,8 +1113,8 @@ msgstr "מכר"
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1128,7 +1140,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1136,7 +1148,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1159,19 +1171,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1184,44 +1196,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "בטל"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr "שחקני×"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1231,20 +1243,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1253,7 +1265,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1261,69 +1273,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1333,68 +1345,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1403,64 +1415,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "×חסן"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr "החזר"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1468,42 +1480,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "השתמש"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1512,13 +1524,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1526,134 +1538,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1661,7 +1673,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1671,7 +1683,7 @@ msgstr "הורד"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "השתמש"
@@ -1679,14 +1691,14 @@ msgstr "השתמש"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1694,7 +1706,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr "השלך"
@@ -1702,48 +1714,48 @@ msgstr "השלך"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr "פצל"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2406,7 +2418,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2574,7 +2586,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "××¤×§×˜×™× ×—×œ×§×™×™×"
@@ -2708,13 +2720,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2794,7 +2806,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3403,12 +3415,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3457,14 +3469,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "נמוך"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "בינוני"
@@ -3478,7 +3490,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "גבוה"
@@ -3833,17 +3845,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4353,8 +4370,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr "טען מחדש כדי שהשינוי יחול."
@@ -4453,8 +4470,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4486,61 +4503,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr "נדרש ×יתחול כדי ×©×”×©×™× ×•×™×™× ×™×”×™×• ברי-תוקף."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr "×ישור ×©×™× ×•×™×™× ×¢×‘×•×¨ OpenGL דורש ×יתחול."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4592,93 +4609,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "×טימות Gui"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "טקסט מעל הר×ש"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "×ופף FX"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "מקסימלי"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5234,7 +5260,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr "שחק"
@@ -5317,7 +5343,7 @@ msgid "Whispering to %s: %s"
msgstr "לוחש ×ל %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6051,33 +6077,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6639,36 +6665,36 @@ msgid "Name: %s"
msgstr "ש×: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr "מעדכן..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr "מתחבר..."
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr "##1 תהליך העדכון ×œ× ×ª×."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr "##1 מומלץ ביותר שתנסה שוב מ×וחר יותר"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr "הסתיי×"
@@ -6715,25 +6741,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6741,7 +6767,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7918,43 +7944,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "×œ×œ× ×©×"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr "חפץ ×œ× ×™×“×•×¢"
diff --git a/po/hr.po b/po/hr.po
index d554dab51..0a75c9244 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/manaplus/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -498,8 +498,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -526,31 +526,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Podešavanje"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr "Slika"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Pomoć"
@@ -563,7 +563,7 @@ msgstr "Pomoć"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -572,32 +572,32 @@ msgid "Close"
msgstr "Zatvori"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -612,7 +612,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -625,65 +625,65 @@ msgid "Error"
msgstr "Greška"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -696,36 +696,36 @@ msgstr "Nepoznata naredba."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Ne mogu poslati prazan Å¡apate!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -734,167 +734,179 @@ msgstr "Ne mogu stvoriti šapat karticu za nadimak \"%s\"! To već postoji ili s
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Ime partije nedostaje."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "Poruka zatvara chat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Poruka sada zatvara chat."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -917,36 +929,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr "Općenito"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr "Spremanje screenshot-a nije uspjelo!"
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr "Mreža Greška"
@@ -983,7 +995,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr "Trgovanje"
@@ -998,7 +1010,7 @@ msgstr "Trgovanje"
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1006,34 +1018,34 @@ msgstr "Napad"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1058,8 +1070,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1079,7 +1091,7 @@ msgstr "Govori"
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1092,7 +1104,7 @@ msgstr "Kupi"
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1102,8 +1114,8 @@ msgstr "Prodaj"
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1129,7 +1141,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1137,7 +1149,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1160,19 +1172,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1185,44 +1197,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "Poništi"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr "IgraÄi"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1232,20 +1244,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1254,7 +1266,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1262,69 +1274,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1334,68 +1346,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1404,64 +1416,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Pohrani"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr "Preuzmi"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1469,42 +1481,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Upotrijebi"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1513,13 +1525,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1527,134 +1539,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1662,7 +1674,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1672,7 +1684,7 @@ msgstr "Skini opremu"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Opremi"
@@ -1680,14 +1692,14 @@ msgstr "Opremi"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1695,7 +1707,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr "Ispusti"
@@ -1703,48 +1715,48 @@ msgstr "Ispusti"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr "Razdvoji"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2407,7 +2419,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2575,7 +2587,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Efekt Äestica"
@@ -2709,13 +2721,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2795,7 +2807,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3404,12 +3416,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3458,14 +3470,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "nisko"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "srednje"
@@ -3479,7 +3491,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "visoko"
@@ -3834,17 +3846,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4354,8 +4371,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr "Ponovo pokrenite klijent da bi promjene bile efektne."
@@ -4454,8 +4471,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4487,61 +4504,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr "Izmjene OpenGL-a zahtjevaju ponovno pokretanje klijenta."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4593,93 +4610,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Prozirnost suÄelja"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "Tekst iznad glave"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Efekti okruženja"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "max"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5235,7 +5261,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr "Igraj"
@@ -5318,7 +5344,7 @@ msgid "Whispering to %s: %s"
msgstr "Å aptaj prema %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6054,33 +6080,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6642,36 +6668,36 @@ msgid "Name: %s"
msgstr "Ime: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr "Ažuriranje"
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr "Spajanje..."
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr "##1 Proces ažuriranja je nepotpun."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr "##1 Vrlo je preporuÄljivo da"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr "Dovršeno"
@@ -6718,25 +6744,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6744,7 +6770,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7921,43 +7947,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "neimenovano"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr "Nepoznati predmet"
diff --git a/po/hu.po b/po/hu.po
index 9d7d43764..2fddd3b07 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Hungarian (http://www.transifex.com/projects/p/manaplus/language/hu/)\n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr "Kereskedési kérelmek elutasítása"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr "Kereskedési kérelmek elfogadása"
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -497,8 +497,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -525,31 +525,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Beállítások"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr "Videó"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Súgó"
@@ -562,7 +562,7 @@ msgstr "Súgó"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -571,32 +571,32 @@ msgid "Close"
msgstr "Bezár"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -611,7 +611,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -624,65 +624,65 @@ msgid "Error"
msgstr "Hiba"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Hiba a frissítési könyvtár létrehozása közben!"
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -695,36 +695,36 @@ msgstr "Ismeretlen parancs."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Nem küldhetsz üres üzenetet!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -733,167 +733,179 @@ msgstr "Nem tudsz fület létrehozni \"%s\" számára! Létre van hozva, vagy te
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "A csapatnév hiányzik."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "Az enter megnyitja a bevitelt."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "Az üzenet bezárja a bevitelt."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "Az enter mostantól megnyitja a bevitelt."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Az üzenet mostantól bezárja a bevitelt."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -916,36 +928,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr "Ãltalános"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr "Hiba a képernyő mentése során!"
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr "Hálózati hiba"
@@ -982,7 +994,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr "Ãœzlet"
@@ -997,7 +1009,7 @@ msgstr "Ãœzlet"
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1005,34 +1017,34 @@ msgstr "Támadás"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1057,8 +1069,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1078,7 +1090,7 @@ msgstr "Csevegés"
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1091,7 +1103,7 @@ msgstr "Vétel"
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1101,8 +1113,8 @@ msgstr "Eladás"
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1128,7 +1140,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1136,7 +1148,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1159,19 +1171,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1184,44 +1196,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "Mégse"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr "Játékosok"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1231,20 +1243,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1253,7 +1265,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1261,69 +1273,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1333,68 +1345,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1403,64 +1415,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Raktároz"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr "Magához vesz"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1468,42 +1480,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Bevet"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1512,13 +1524,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1526,134 +1538,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1661,7 +1673,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1671,7 +1683,7 @@ msgstr "Nem használ"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Használ"
@@ -1679,14 +1691,14 @@ msgstr "Használ"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1694,7 +1706,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr "Eldob"
@@ -1702,48 +1714,48 @@ msgstr "Eldob"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr "Felosztás"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2406,7 +2418,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2574,7 +2586,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Játékbéli effektek"
@@ -2708,13 +2720,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2794,7 +2806,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3403,12 +3415,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3457,14 +3469,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "alacsony"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "közepes"
@@ -3478,7 +3490,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "magas"
@@ -3833,17 +3845,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4353,8 +4370,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
@@ -4453,8 +4470,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4486,61 +4503,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr "A változások érvénybe lépéséhez a program újraindítása szükséges."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4592,93 +4609,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Menük áttetszősége"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "Fej feletti szöveg"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Környezeti effektek"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "max."
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5234,7 +5260,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr "Játék"
@@ -5317,7 +5343,7 @@ msgid "Whispering to %s: %s"
msgstr "Üzenet %s számára: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6051,33 +6077,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6639,36 +6665,36 @@ msgid "Name: %s"
msgstr "Név: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr "Frissítés…"
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr "Csatlakozás…"
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr "##1 A frissítési folyamat befejezetlen"
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr "##1 Erősen ajánljuk, hogy"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr "Kész"
@@ -6715,25 +6741,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6741,7 +6767,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7918,43 +7944,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "Névtelen"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr "Ismeretlen tárgy"
diff --git a/po/id.po b/po/id.po
index 42b5bf5ae..8574e1256 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: 2014-01-18 12:47+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
"language/id/)\n"
@@ -37,25 +37,25 @@ msgid "Visible on map"
msgstr "Terlihat di peta"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:327
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "Menghindar"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "miss"
msgstr "Luput"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1933 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1938 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "l"
@@ -527,31 +527,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1136 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Pengaturan"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1149 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Bantuan"
@@ -564,7 +564,7 @@ msgstr "Bantuan"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1153 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -573,32 +573,32 @@ msgid "Close"
msgstr "Tutup"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1278
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Terhubung dengan server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Masuk"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1364
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Memasuki arena permainan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1489
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "Pemilihan karakter"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1529
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "terhubung dengan server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1542
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "Pergantian server"
@@ -613,7 +613,7 @@ msgstr "Pergantian server"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1603 src/client.cpp:1614 src/client.cpp:1798
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -626,65 +626,65 @@ msgid "Error"
msgstr "Kesalahan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1626
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "Meminta detail registrasi"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1667
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "Ubah sandi"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1669
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "Perubahan sandi berhasil"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1691
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "Perubahan email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1693
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "Perubahan email berhasil"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1716
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "Telah tidak terdaftar"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1718
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "Selamat tinggal, datang kembali setiap saat"
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1995 src/client.cpp:2010 src/client.cpp:2055
-#: src/client.cpp:2071 src/client.cpp:2520 src/client.cpp:2528
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2227
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2268 src/client.cpp:2275
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Gagal membuat direktori update!"
-#: src/client.cpp:2297 src/client.cpp:2314
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
#. TRANSLATORS: error message question
-#: src/client.cpp:2978
+#: src/client.cpp:3000
msgid "Do you want to open support page?"
msgstr ""
@@ -697,36 +697,36 @@ msgstr "Perintah tidak dikenal."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr "Tetapkan sebuah nama"
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr "Pemain telah %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr "Pemain telah berhasil %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr "Pemain tidak bisa %s!"
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Tidak dapat mengirimkan pesan tanpa nama"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -737,167 +737,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Nama kelompok tidak dapat di temukan"
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr "Nama organisasi tidak ditemukan."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "Kembalikan pengalihan obrolan"
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "Tutup pesan obrolan"
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "Kembalikan sekarang pengalihan obrolan"
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Pesan menutup obrolan"
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "Teman"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr "Diabaikan"
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr "netral"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr "Pemain tidak diabaikan!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr "Pemain tidak lagi diabaikan!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr "Pemain tidak dapat diabaikan"
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr "Pemain telah terhapus"
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr "Pemain telah berhasil dihapus"
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr "Pemain tidak dapat dihapus"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:906 src/commands.cpp:962
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1116
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1342
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1349
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1356
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1380 src/commands.cpp:1389
+#: src/commands.cpp:1476 src/commands.cpp:1485
msgid "Resource images:"
msgstr "Sumber gambar"
#. TRANSLATORS: dump command
-#: src/commands.cpp:1383 src/commands.cpp:1392
+#: src/commands.cpp:1479 src/commands.cpp:1488
msgid "Resource orphaned images:"
msgstr ""
@@ -934,23 +946,23 @@ msgid "Debug"
msgstr "Debug"
#. TRANSLATORS: save file message
-#: src/game.cpp:573
+#: src/game.cpp:572
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:583
+#: src/game.cpp:582
msgid "Saving screenshot failed!"
msgstr "Gagal menyimpan screenshot!"
#. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
msgid "The connection to the server was lost."
msgstr "Koneksi ke server terputus"
#. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
msgid "Network Error"
msgstr "Kesalahan jaringan"
@@ -1064,7 +1076,7 @@ msgstr "Sembunyikan"
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
-#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1912 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "Jalan"
@@ -1176,7 +1188,7 @@ msgstr "Tambahkan nama ke Obrolan"
#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1797
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1258,7 +1270,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1410,7 +1422,7 @@ msgstr "Tambahkan semua ke Penukaran"
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Simpan"
@@ -1475,7 +1487,7 @@ msgstr "Ambil semua"
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Gunakan"
@@ -1666,9 +1678,9 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:680
+#: src/gui/windows/inventorywindow.cpp:682
msgid "Unequip"
msgstr "Lepaskan"
@@ -1677,7 +1689,7 @@ msgstr "Lepaskan"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Pakai"
@@ -1685,7 +1697,7 @@ msgstr "Pakai"
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:788
+#: src/gui/windows/inventorywindow.cpp:790
msgid "Drop..."
msgstr "Buang..."
@@ -1700,7 +1712,7 @@ msgstr "Buang semuanya"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:793
+#: src/gui/windows/inventorywindow.cpp:795
msgid "Drop"
msgstr "Buang"
@@ -1789,8 +1801,9 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr ""
+#, fuzzy
+msgid "Stop Attack / Modifier key"
+msgstr "Kunci pengubah"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:105
@@ -2305,100 +2318,95 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr "Kunci pengubah"
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
msgid "Show onscreen keyboard"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
msgid "Move Keys"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
msgid "Move Up"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
msgid "Move Down"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
msgid "Move Left"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
msgid "Move Right"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
msgid "Move Forward"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
msgid "Move to navigation point shortcuts"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1440
-#: src/gui/setupactiondata.h:1446 src/gui/setupactiondata.h:1452
-#: src/gui/setupactiondata.h:1458 src/gui/setupactiondata.h:1464
-#: src/gui/setupactiondata.h:1470 src/gui/setupactiondata.h:1476
-#: src/gui/setupactiondata.h:1482 src/gui/setupactiondata.h:1488
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: src/gui/setupactiondata.h:1686 src/gui/setupactiondata.h:1692
-#: src/gui/setupactiondata.h:1698 src/gui/setupactiondata.h:1704
-#: src/gui/setupactiondata.h:1710 src/gui/setupactiondata.h:1716
+#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1434
+#: src/gui/setupactiondata.h:1440 src/gui/setupactiondata.h:1446
+#: src/gui/setupactiondata.h:1452 src/gui/setupactiondata.h:1458
+#: src/gui/setupactiondata.h:1464 src/gui/setupactiondata.h:1470
+#: src/gui/setupactiondata.h:1476 src/gui/setupactiondata.h:1482
+#: src/gui/setupactiondata.h:1488 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 src/gui/setupactiondata.h:1686
+#: src/gui/setupactiondata.h:1692 src/gui/setupactiondata.h:1698
+#: src/gui/setupactiondata.h:1704 src/gui/setupactiondata.h:1710
#, c-format
msgid "Move to point Shortcut %d"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
msgid "Move & selection"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
msgid "Move Home"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
msgid "Move End"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
msgid "Page up"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
msgid "Page down"
msgstr ""
@@ -2407,23 +2415,23 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1785 src/gui/setupactiondata.h:1930
+#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
msgstr "Lainnya"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
msgid "Select"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
msgid "Select2"
msgstr ""
@@ -2433,7 +2441,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1809 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
#: src/gui/windows/charselectdialog.cpp:106
#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
#: src/gui/windows/shopwindow.cpp:100
@@ -2442,45 +2450,45 @@ msgid "Delete"
msgstr "Hapus"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
msgid "Backspace"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
msgid "Insert"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
msgid "Tab"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
msgid "Mod"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
msgid "Ctrl"
msgstr ""
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
msgid "Basic"
msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1920 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
msgid "Shortcuts"
msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
#: src/gui/windowmenu.cpp:161
msgid "Windows"
msgstr ""
@@ -2488,7 +2496,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: emotes window name
#. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1924 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
#: src/gui/windows/emotewindow.cpp:107
msgid "Emotes"
msgstr ""
@@ -2496,13 +2504,13 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1928 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
msgid "Chat"
msgstr "Obrolan"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
msgid "Gui"
msgstr ""
@@ -2579,7 +2587,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Efek partikel"
@@ -2713,14 +2721,14 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
-#: src/gui/windows/inventorywindow.cpp:598
+#: src/gui/widgets/characterdisplay.cpp:136
+#: src/gui/windows/inventorywindow.cpp:600
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2799,7 +2807,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:339 src/gui/widgets/setupitem.cpp:475
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr "Ganti"
@@ -3462,14 +3470,14 @@ msgstr "kembalikan ke semula"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "rendah"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "sedang"
@@ -3483,7 +3491,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "tinggi"
@@ -4363,8 +4371,8 @@ msgstr "Tema diganti"
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:499
+#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "Restart client anda untuk memberikan efek."
@@ -4451,106 +4459,106 @@ msgid "Button %u action"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:190
msgid "Full screen"
msgstr "Layar penuh"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
msgid "FPS limit:"
msgstr "Batas FPS:"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:194
-#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:198
+#: src/gui/widgets/tabs/setup_video.cpp:240
+#: src/gui/widgets/tabs/setup_video.cpp:429
+#: src/gui/widgets/tabs/setup_video.cpp:557
msgid "Alt FPS limit: "
msgstr "batas Alt FPS:"
#. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:197
+#: src/gui/widgets/tabs/setup_video.cpp:201
msgid "Detect best mode"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:210
msgid "Show cursor"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:213
msgid "Custom cursor"
msgstr "Modifikasi kursor"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:217
msgid "Enable resize"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:220
msgid "No frame"
msgstr ""
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:241
+#: src/gui/widgets/tabs/setup_video.cpp:427
+#: src/gui/widgets/tabs/setup_video.cpp:541
+#: src/gui/widgets/tabs/setup_video.cpp:554
msgid "None"
msgstr "Tidak ada"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:349
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:356
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:368
msgid "Switching to Full Screen"
msgstr "Mengubah ke mode Layar penuh"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:370
msgid "Restart needed for changes to take effect."
msgstr "Memulai dari awal di butuhkan untuk melihat efek"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:388
msgid "Changing to OpenGL"
msgstr "Mengubah ke OpenGL"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:390
msgid "Applying change to OpenGL requires restart."
msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:468
msgid "Custom resolution (example: 1024x768)"
msgstr "Modifikasi resolusi (contoh: 1024x768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:470
msgid "Enter new resolution: "
msgstr "Masukkan resolusi baru:"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:497
+#: src/gui/widgets/tabs/setup_video.cpp:506
msgid "Screen Resolution Changed"
msgstr "Resolusi layar diubah"
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:500
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4602,93 +4610,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr ""
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "maksimal"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr "Detil partikel"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -4805,7 +4822,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
#: src/gui/windows/inventorywindow.cpp:228
msgid "Equipment"
msgstr "Perlengkapan"
@@ -5326,7 +5343,7 @@ msgid "Whispering to %s: %s"
msgstr "Berbisik ke %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1607
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6079,12 +6096,12 @@ msgid "Error retreiving server list!"
msgstr "Gagal mengunduh data server!"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:638
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr "Membutuhkan versi terbaru"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:643
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr "Membutuhkan v%s"
diff --git a/po/it.po b/po/it.po
index 27b28733e..29001c15f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-01-18 12:47+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
"language/it/)\n"
@@ -41,25 +41,25 @@ msgid "Visible on map"
msgstr "Visibile nella mappa"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:327
+#: src/being/being.cpp:329
msgid "Human"
msgstr "Umano"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "Schivato"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "miss"
msgstr "Mancato"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1933 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1938 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "I"
@@ -532,31 +532,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1136 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Impostazioni"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1149 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Aiuto"
@@ -569,7 +569,7 @@ msgstr "Aiuto"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1153 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -578,32 +578,32 @@ msgid "Close"
msgstr "Chiudi"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1278
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Connessione al server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Accesso all'account"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1364
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Accesso al gioco"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1489
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "Caricamento personaggi"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1529
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "Connessione al server del gioco"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1542
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "Cambiamento server del gioco"
@@ -618,7 +618,7 @@ msgstr "Cambiamento server del gioco"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1603 src/client.cpp:1614 src/client.cpp:1798
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -631,65 +631,65 @@ msgid "Error"
msgstr "Errore"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1626
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "Richiesta dettagli di registrazione"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1667
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "Cambia password"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1669
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "Password modificata con successo!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1691
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "Cambia Email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1693
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "Email cambiata con successo!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1716
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "Annullamento registrazione effettuato con successo"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1718
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "Addio, torna quando vuoi..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1995 src/client.cpp:2010 src/client.cpp:2055
-#: src/client.cpp:2071 src/client.cpp:2520 src/client.cpp:2528
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
#, 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."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2227
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2268 src/client.cpp:2275
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Errore durante la creazione della directory degli aggiornamenti"
-#: src/client.cpp:2297 src/client.cpp:2314
+#: src/client.cpp:2299 src/client.cpp:2316
#, 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."
#. TRANSLATORS: error message question
-#: src/client.cpp:2978
+#: src/client.cpp:3000
msgid "Do you want to open support page?"
msgstr ""
@@ -702,36 +702,36 @@ msgstr "Comando sconosciuto."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr "Prego specificare un nome."
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr "Il giocatore è già %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr "Il giocatore è stato %s con successo!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr "Il giocatore non può essere %s!"
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Impossibile inviare un sussurro vuoto!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -742,167 +742,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Manca il nome del party."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr "Manca il nome della gilda."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "Attiva/disattiva la chat."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "I messaggi chiudono la conversazione."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "Attiva/disattiva la chat adesso."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "I messaggi adesso chiudono la chat."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "Amico"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr "Disprezzato"
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr "Neutrale"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr "Il giocatore non era ignorato!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr "Giocatore non più ignorato!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr "Impossibile annullare l'ignoro!"
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr "nella lista nera"
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr "nemico"
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr "Il giocatore è già cancellato!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr "Giocatore cancellato dal tuo schermo con successo!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr "Il giocatore non può essere cancellato!"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:906 src/commands.cpp:962
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr "Tempo online: %s"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr "%d settimane"
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr "%d giorni"
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr "%d ore"
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr "%d minuti"
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr "%d secondi"
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1116
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1342
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1349
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1356
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1380 src/commands.cpp:1389
+#: src/commands.cpp:1476 src/commands.cpp:1485
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1383 src/commands.cpp:1392
+#: src/commands.cpp:1479 src/commands.cpp:1488
msgid "Resource orphaned images:"
msgstr ""
@@ -940,23 +952,23 @@ msgid "Debug"
msgstr "Debug"
#. TRANSLATORS: save file message
-#: src/game.cpp:573
+#: src/game.cpp:572
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:583
+#: src/game.cpp:582
msgid "Saving screenshot failed!"
msgstr "Salvataggio immagine fallito!"
#. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
msgid "The connection to the server was lost."
msgstr "La connessione al server è caduta."
#. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
msgid "Network Error"
msgstr "Errore di rete"
@@ -1070,7 +1082,7 @@ msgstr "Nascondi"
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
-#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1912 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "Movimento"
@@ -1182,7 +1194,7 @@ msgstr "Aggiungi nome alla chat"
#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1797
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1264,7 +1276,7 @@ msgstr "Muovi telecamera"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1416,7 +1428,7 @@ msgstr "Aggiungi tutti"
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Magazzino"
@@ -1481,7 +1493,7 @@ msgstr "Ritira tutto"
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Usa"
@@ -1672,9 +1684,9 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:680
+#: src/gui/windows/inventorywindow.cpp:682
msgid "Unequip"
msgstr "Togli"
@@ -1683,7 +1695,7 @@ msgstr "Togli"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Equipaggia"
@@ -1691,7 +1703,7 @@ msgstr "Equipaggia"
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:788
+#: src/gui/windows/inventorywindow.cpp:790
msgid "Drop..."
msgstr "Lascia..."
@@ -1706,7 +1718,7 @@ msgstr "Lascia tutto"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:793
+#: src/gui/windows/inventorywindow.cpp:795
msgid "Drop"
msgstr "Lascia"
@@ -1795,8 +1807,8 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "Ferma attacco"
+msgid "Stop Attack / Modifier key"
+msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:105
@@ -2311,100 +2323,95 @@ msgstr "Cambia Visuale"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
msgid "Show onscreen keyboard"
msgstr "Mostra tastiera su schermo"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
msgid "Move Keys"
msgstr "Tasti Movimento"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
msgid "Move Up"
msgstr "Muoviti verso l'alto"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
msgid "Move Down"
msgstr "Muoviti verso il basso"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
msgid "Move Left"
msgstr "Muoviti verso sinistra"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
msgid "Move Right"
msgstr "Muoviti verso destra"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
msgid "Move Forward"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
msgid "Move to navigation point shortcuts"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1440
-#: src/gui/setupactiondata.h:1446 src/gui/setupactiondata.h:1452
-#: src/gui/setupactiondata.h:1458 src/gui/setupactiondata.h:1464
-#: src/gui/setupactiondata.h:1470 src/gui/setupactiondata.h:1476
-#: src/gui/setupactiondata.h:1482 src/gui/setupactiondata.h:1488
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: src/gui/setupactiondata.h:1686 src/gui/setupactiondata.h:1692
-#: src/gui/setupactiondata.h:1698 src/gui/setupactiondata.h:1704
-#: src/gui/setupactiondata.h:1710 src/gui/setupactiondata.h:1716
+#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1434
+#: src/gui/setupactiondata.h:1440 src/gui/setupactiondata.h:1446
+#: src/gui/setupactiondata.h:1452 src/gui/setupactiondata.h:1458
+#: src/gui/setupactiondata.h:1464 src/gui/setupactiondata.h:1470
+#: src/gui/setupactiondata.h:1476 src/gui/setupactiondata.h:1482
+#: src/gui/setupactiondata.h:1488 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 src/gui/setupactiondata.h:1686
+#: src/gui/setupactiondata.h:1692 src/gui/setupactiondata.h:1698
+#: src/gui/setupactiondata.h:1704 src/gui/setupactiondata.h:1710
#, c-format
msgid "Move to point Shortcut %d"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
msgid "Move & selection"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
msgid "Move Home"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
msgid "Move End"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
msgid "Page up"
msgstr "Page up"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
msgid "Page down"
msgstr "Page down"
@@ -2413,23 +2420,23 @@ msgstr "Page down"
#. TRANSLATORS: settings group
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1785 src/gui/setupactiondata.h:1930
+#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
msgstr "Altro"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
msgid "Select"
msgstr "Seleziona"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
msgid "Select2"
msgstr ""
@@ -2439,7 +2446,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1809 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
#: src/gui/windows/charselectdialog.cpp:106
#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
#: src/gui/windows/shopwindow.cpp:100
@@ -2448,45 +2455,45 @@ msgid "Delete"
msgstr "Elimina"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
msgid "Backspace"
msgstr "Backspace"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
msgid "Insert"
msgstr "Insert"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
msgid "Tab"
msgstr "Tab"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
msgid "Mod"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
msgid "Ctrl"
msgstr ""
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
msgid "Basic"
msgstr "Base"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1920 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
msgid "Shortcuts"
msgstr "Shortcuts"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
#: src/gui/windowmenu.cpp:161
msgid "Windows"
msgstr "Finestre"
@@ -2494,7 +2501,7 @@ msgstr "Finestre"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: emotes window name
#. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1924 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
#: src/gui/windows/emotewindow.cpp:107
msgid "Emotes"
msgstr "Faccine"
@@ -2502,13 +2509,13 @@ msgstr "Faccine"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1928 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
msgid "Chat"
msgstr "Chat"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
msgid "Gui"
msgstr ""
@@ -2585,7 +2592,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Effetti particelle"
@@ -2719,14 +2726,14 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
-#: src/gui/windows/inventorywindow.cpp:598
+#: src/gui/widgets/characterdisplay.cpp:136
+#: src/gui/windows/inventorywindow.cpp:600
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2805,7 +2812,7 @@ msgstr "Apri url"
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:339 src/gui/widgets/setupitem.cpp:475
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr "Modifica"
@@ -3470,14 +3477,14 @@ msgstr "Predefinito"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "Basso"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "medio"
@@ -3491,7 +3498,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "Alto"
@@ -3847,9 +3854,8 @@ msgstr "Usa FBO, Frame Buffer Object (OpenGL)"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:376
-#, fuzzy
msgid "Screenshot directory"
-msgstr "Screenshot"
+msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:381
@@ -4372,8 +4378,8 @@ msgstr "Tema cambiato"
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:499
+#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "Per applicare le modifiche, è necessario riavviare il client."
@@ -4460,59 +4466,59 @@ msgid "Button %u action"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:190
msgid "Full screen"
msgstr "Schermo intero"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
msgid "FPS limit:"
msgstr "Limite FPS:"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:194
-#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:198
+#: src/gui/widgets/tabs/setup_video.cpp:240
+#: src/gui/widgets/tabs/setup_video.cpp:429
+#: src/gui/widgets/tabs/setup_video.cpp:557
msgid "Alt FPS limit: "
msgstr "Limite Alt FPS: "
#. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:197
+#: src/gui/widgets/tabs/setup_video.cpp:201
msgid "Detect best mode"
msgstr "Trova modalita' migliore"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:210
msgid "Show cursor"
msgstr "Mostra cursore"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:213
msgid "Custom cursor"
msgstr "Cursore personalizzato"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:217
msgid "Enable resize"
msgstr "Permetti ridimensiona"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:220
msgid "No frame"
msgstr ""
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:241
+#: src/gui/widgets/tabs/setup_video.cpp:427
+#: src/gui/widgets/tabs/setup_video.cpp:541
+#: src/gui/widgets/tabs/setup_video.cpp:554
msgid "None"
msgstr "Nessuno"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:349
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
@@ -4520,7 +4526,7 @@ msgstr ""
"precedente è fallito!"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:356
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
@@ -4528,42 +4534,42 @@ msgstr ""
"modalità precedente è fallito!"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:368
msgid "Switching to Full Screen"
msgstr "Cambiamento a schermo intero"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:370
msgid "Restart needed for changes to take effect."
msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:388
msgid "Changing to OpenGL"
msgstr "Passa a OpenGL"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:390
msgid "Applying change to OpenGL requires restart."
msgstr "Riavvia per passare a OpenGL."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:468
msgid "Custom resolution (example: 1024x768)"
msgstr "Risoluzione scelta (esempio 1024x768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:470
msgid "Enter new resolution: "
msgstr "Nuova risoluzione: "
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:497
+#: src/gui/widgets/tabs/setup_video.cpp:506
msgid "Screen Resolution Changed"
msgstr "RIsoluzione schermo cambiata"
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:500
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Alcune finestre potrebbero essere spostate per addattarsi alla risoluzione "
@@ -4617,93 +4623,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr "Visuale"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr "Notifiche"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr "Notifica oggetti raccolti nella chat."
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr "Notifica oggetti raccolti in-game."
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr "Effetti"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr "Abilita texture sfocate (OpenGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Opacità IU"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "Testo sovrastante"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Suoni ambientali"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "massimo"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr "Dettaglio particelle"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr "Fisica Particle"
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr "Gamma"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr "Abilita controllo gamma"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr "Vsync"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr "Centra la finestra di gioco"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr "Permetti allo screensaver di attivarsi"
@@ -4823,7 +4838,7 @@ msgstr "EQU"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
#: src/gui/windows/inventorywindow.cpp:228
msgid "Equipment"
msgstr "Equipaggiamento"
@@ -5344,7 +5359,7 @@ msgid "Whispering to %s: %s"
msgstr "Sussurra a %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1607
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6099,12 +6114,12 @@ msgid "Error retreiving server list!"
msgstr "Errore nel ricevimento della lista sei server!"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:638
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr "Richiede una versione più nuova"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:643
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr "Richiede v%s"
@@ -7999,3 +8014,6 @@ msgstr "Oggetto sconosciuto"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
+
+#~ msgid "Stop Attack"
+#~ msgstr "Ferma attacco"
diff --git a/po/ja.po b/po/ja.po
index ae7e94441..71508dad1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,8 +13,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-01-18 12:47+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
"language/ja/)\n"
@@ -40,25 +40,25 @@ msgid "Visible on map"
msgstr "マップã«è¡¨ç¤ºã•ã›ã‚‹"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:327
+#: src/being/being.cpp:329
msgid "Human"
msgstr "人間"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "ドッジ"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "miss"
msgstr "ミス"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1933 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1938 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "I"
@@ -530,31 +530,31 @@ msgstr "å¹å‡ºã—"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1136 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "設定"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "ビデオ"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr "テーマ"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1149 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "ヘルプ"
@@ -567,7 +567,7 @@ msgstr "ヘルプ"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1153 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -576,32 +576,32 @@ msgid "Close"
msgstr "é–‰ã˜ã‚‹"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1278
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "サーãƒãƒ¼ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "ログインã—ã¦ã„ã¾ã™"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1364
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "ゲームã®ä¸–ç•Œã«ç§»å‹•ã—ã¦ã„ã¾ã™"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1489
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "キャラクターを呼ã³å‡ºã—ã¦ã„ã¾ã™"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1529
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "ゲームサーãƒãƒ¼ã«æŽ¥ç¶šã—ã¦ã„ã¾ã™"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1542
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "ゲームサーãƒãƒ¼ã‚’変更ã—ã¦ã„ã¾ã™"
@@ -616,7 +616,7 @@ msgstr "ゲームサーãƒãƒ¼ã‚’変更ã—ã¦ã„ã¾ã™"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1603 src/client.cpp:1614 src/client.cpp:1798
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -629,65 +629,65 @@ msgid "Error"
msgstr "エラー"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1626
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "登録内容を呼ã³å‡ºã—ã¦ã„ã¾ã™"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1667
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "パスワード変更"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1669
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "パスワードを変更ã—ã¾ã—ãŸ"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1691
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "メールアドレス変更"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1693
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "メールアドレスを変更ã—ã¾ã—ãŸ"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1716
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "登録を解除ã—ã¾ã—ãŸ"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1718
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "ã•ã‚ˆã†ãªã‚‰ã€€ã¾ãŸä¼šã„ã¾ã—ょã†"
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1995 src/client.cpp:2010 src/client.cpp:2055
-#: src/client.cpp:2071 src/client.cpp:2520 src/client.cpp:2528
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%sã¯å­˜åœ¨ã—ãªã„為ã€ä½œæˆã§ãã¾ã›ã‚“"
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2227
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2268 src/client.cpp:2275
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "更新フォルダã®ä½œæˆã‚¨ãƒ©ãƒ¼"
-#: src/client.cpp:2297 src/client.cpp:2314
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "エラー: %s ã¯å­˜åœ¨ã—ãªã„為ã€ä½œæˆã§ãã¾ã›ã‚“"
#. TRANSLATORS: error message question
-#: src/client.cpp:2978
+#: src/client.cpp:3000
msgid "Do you want to open support page?"
msgstr ""
@@ -700,36 +700,36 @@ msgstr "ä¸æ˜Žãªã‚³ãƒžãƒ³ãƒ‰ã§ã™"
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr "åå‰ã‚’入力ã—ã¦ãã ã•ã„"
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr "プレイヤーã¯æ—¢ã«%s"
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr "プレイヤーã®%sã«æˆåŠŸã—ã¾ã—ãŸ"
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr "プレイヤーを%sã§ããªã‹ã£ãŸ"
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "空ã®ã•ã•ã‚„ãã‚’é€ä¿¡ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -740,167 +740,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "パーティåãŒã‚ã‚Šã¾ã›ã‚“"
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr "ギルドåãŒã‚ã‚Šã¾ã›ã‚“"
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "改行キーã§ãƒãƒ£ãƒƒãƒˆå…¥åŠ›ãŒã§ãã¾ã™"
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "ãƒãƒ£ãƒƒãƒˆã‚’é–‰ã˜ã¾ã™"
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "改行キーã§ãƒãƒ£ãƒƒãƒˆå…¥åŠ›ãŒã§ãã¾ã™"
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "ãƒãƒ£ãƒƒãƒˆã‚’é–‰ã˜ã¾ã™"
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "å‹é”"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr "無視"
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr "中性"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr "プレイヤーを完全無視ã§ãã¾ã›ã‚“ã§ã—ãŸ"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr "プレイヤーを完全無視解除ã—ã¾ã—ãŸ"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr "プレイヤーを完全無視解除ã§ãã¾ã›ã‚“ã§ã—ãŸ"
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr "ブラックリスト化ã•ã‚Œã¦ã„ã¾ã™"
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr "敵"
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr "プレイヤーã¯å‰Šé™¤ã•ã‚Œã¦ã„ã¾ã™"
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr "プレイヤーを削除ã—ã¾ã—ãŸ"
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr "プレイヤーを削除ã§ãã¾ã›ã‚“ã§ã—ãŸ"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:906 src/commands.cpp:962
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr "クライアントã®ç¨¼åƒæ™‚é–“: %s"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr "%d週"
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr "%dæ—¥"
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr "%d時"
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr "%d分"
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr "%d秒"
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1116
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1342
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1349
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1356
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1380 src/commands.cpp:1389
+#: src/commands.cpp:1476 src/commands.cpp:1485
msgid "Resource images:"
msgstr "リソースイメージ:"
#. TRANSLATORS: dump command
-#: src/commands.cpp:1383 src/commands.cpp:1392
+#: src/commands.cpp:1479 src/commands.cpp:1488
msgid "Resource orphaned images:"
msgstr "リソース孤å…イメージ:"
@@ -937,23 +949,23 @@ msgid "Debug"
msgstr "デãƒãƒƒã‚°"
#. TRANSLATORS: save file message
-#: src/game.cpp:573
+#: src/game.cpp:572
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:583
+#: src/game.cpp:582
msgid "Saving screenshot failed!"
msgstr "スクリーンショットをä¿å­˜ã§ãã¾ã›ã‚“ã§ã—ãŸ"
#. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
msgid "The connection to the server was lost."
msgstr "サーãƒãƒ¼ã¸ã®æŽ¥ç¶šãŒåˆ‡æ–­ã•ã‚Œã¾ã—ãŸ"
#. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
msgid "Network Error"
msgstr "ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚¨ãƒ©ãƒ¼"
@@ -1067,7 +1079,7 @@ msgstr "消ã™"
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
-#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1912 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "å‹•ã"
@@ -1179,7 +1191,7 @@ msgstr "åå‰ã‚’ãƒãƒ£ãƒƒãƒˆã¸è¿½åŠ ã™ã‚‹"
#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1797
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1261,7 +1273,7 @@ msgstr "カメラを動ã‹ã™"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1413,7 +1425,7 @@ msgstr "トレードウィンドウã«å…¨ã¦è¿½åŠ ã™ã‚‹"
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "ä¿ç®¡"
@@ -1478,7 +1490,7 @@ msgstr "全部å–出ã™"
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "使用"
@@ -1669,9 +1681,9 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:680
+#: src/gui/windows/inventorywindow.cpp:682
msgid "Unequip"
msgstr "å–外ã™"
@@ -1680,7 +1692,7 @@ msgstr "å–外ã™"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "装ç€"
@@ -1688,7 +1700,7 @@ msgstr "装ç€"
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:788
+#: src/gui/windows/inventorywindow.cpp:790
msgid "Drop..."
msgstr "è½ã¨ã™..."
@@ -1703,7 +1715,7 @@ msgstr "å…¨ã¦è½ã¨ã™"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:793
+#: src/gui/windows/inventorywindow.cpp:795
msgid "Drop"
msgstr "è½ã¨ã™"
@@ -1792,8 +1804,9 @@ msgstr "ナビゲーションãƒã‚¤ãƒ³ãƒˆã¸ç§»å‹•"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "攻撃を止ã‚ã‚‹"
+#, fuzzy
+msgid "Stop Attack / Modifier key"
+msgstr "ショートカット編集キー"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:105
@@ -2308,100 +2321,95 @@ msgstr "カメラモード変更"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr "モディファイアキー"
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
msgid "Show onscreen keyboard"
msgstr "オンスクリーンキーボード"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
msgid "Move Keys"
msgstr "キーを移動"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
msgid "Move Up"
msgstr "上ã¸ç§»å‹•"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
msgid "Move Down"
msgstr "下ã¸ç§»å‹•"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
msgid "Move Left"
msgstr "å·¦ã¸ç§»å‹•"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
msgid "Move Right"
msgstr "å³ã¸ç§»å‹•"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
msgid "Move Forward"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
msgid "Move to navigation point shortcuts"
msgstr "ナビãƒã‚¤ãƒ³ãƒˆã‚·ãƒ§ãƒ¼ãƒˆã‚«ãƒƒãƒˆã¾ã§ç§»å‹•"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1440
-#: src/gui/setupactiondata.h:1446 src/gui/setupactiondata.h:1452
-#: src/gui/setupactiondata.h:1458 src/gui/setupactiondata.h:1464
-#: src/gui/setupactiondata.h:1470 src/gui/setupactiondata.h:1476
-#: src/gui/setupactiondata.h:1482 src/gui/setupactiondata.h:1488
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: src/gui/setupactiondata.h:1686 src/gui/setupactiondata.h:1692
-#: src/gui/setupactiondata.h:1698 src/gui/setupactiondata.h:1704
-#: src/gui/setupactiondata.h:1710 src/gui/setupactiondata.h:1716
+#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1434
+#: src/gui/setupactiondata.h:1440 src/gui/setupactiondata.h:1446
+#: src/gui/setupactiondata.h:1452 src/gui/setupactiondata.h:1458
+#: src/gui/setupactiondata.h:1464 src/gui/setupactiondata.h:1470
+#: src/gui/setupactiondata.h:1476 src/gui/setupactiondata.h:1482
+#: src/gui/setupactiondata.h:1488 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 src/gui/setupactiondata.h:1686
+#: src/gui/setupactiondata.h:1692 src/gui/setupactiondata.h:1698
+#: src/gui/setupactiondata.h:1704 src/gui/setupactiondata.h:1710
#, c-format
msgid "Move to point Shortcut %d"
msgstr "ショートカット %dã¾ã§ç§»å‹•"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
msgid "Move & selection"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
msgid "Move Home"
msgstr "ホームã¸ç§»å‹•"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
msgid "Move End"
msgstr "最後ã¾ã§ç§»å‹•"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
msgid "Page up"
msgstr "ページ上ã¸"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
msgid "Page down"
msgstr "ページ下ã¸"
@@ -2410,23 +2418,23 @@ msgstr "ページ下ã¸"
#. TRANSLATORS: settings group
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1785 src/gui/setupactiondata.h:1930
+#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
msgstr "ãã®ä»–"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
msgid "Select"
msgstr "é¸æŠž"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
msgid "Select2"
msgstr "é¸æŠž2"
@@ -2436,7 +2444,7 @@ msgstr "é¸æŠž2"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1809 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
#: src/gui/windows/charselectdialog.cpp:106
#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
#: src/gui/windows/shopwindow.cpp:100
@@ -2445,45 +2453,45 @@ msgid "Delete"
msgstr "削除"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
msgid "Backspace"
msgstr "ãƒãƒƒã‚¯ã‚¹ãƒšãƒ¼ã‚¹"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
msgid "Insert"
msgstr "挿入"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
msgid "Tab"
msgstr "タブ"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
msgid "Mod"
msgstr "モッド"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
msgid "Ctrl"
msgstr ""
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
msgid "Basic"
msgstr "基本"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1920 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
msgid "Shortcuts"
msgstr "ショートカット"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
#: src/gui/windowmenu.cpp:161
msgid "Windows"
msgstr "ウィンドウ"
@@ -2491,7 +2499,7 @@ msgstr "ウィンドウ"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: emotes window name
#. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1924 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
#: src/gui/windows/emotewindow.cpp:107
msgid "Emotes"
msgstr "スマイリー"
@@ -2499,13 +2507,13 @@ msgstr "スマイリー"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1928 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
msgid "Chat"
msgstr "ãƒãƒ£ãƒƒãƒˆ"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
msgid "Gui"
msgstr "GUI"
@@ -2582,7 +2590,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "パーティクル効果"
@@ -2716,14 +2724,14 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
-#: src/gui/windows/inventorywindow.cpp:598
+#: src/gui/widgets/characterdisplay.cpp:136
+#: src/gui/windows/inventorywindow.cpp:600
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2802,7 +2810,7 @@ msgstr "URLã‚’é–‹ã"
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:339 src/gui/widgets/setupitem.cpp:475
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr "編集"
@@ -3469,14 +3477,14 @@ msgstr "デフォルト"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "低"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "中"
@@ -3490,7 +3498,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "高"
@@ -3846,9 +3854,8 @@ msgstr "スクリーンショットã«FBOを使ㆠ(OpenGLã®ã¿)"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:376
-#, fuzzy
msgid "Screenshot directory"
-msgstr "スクリーンショット"
+msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:381
@@ -4371,8 +4378,8 @@ msgstr "テーマを変更ã—ã¾ã—ãŸ"
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:499
+#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "設定変更ã®ç‚ºã‚¢ãƒ—リケーションをå†èµ·å‹•ã—ã¦ãã ã•ã„"
@@ -4459,106 +4466,106 @@ msgid "Button %u action"
msgstr "ボタン %u アクション"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:190
msgid "Full screen"
msgstr "フルスクリーン"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
msgid "FPS limit:"
msgstr "FPSリミット:"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:194
-#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:198
+#: src/gui/widgets/tabs/setup_video.cpp:240
+#: src/gui/widgets/tabs/setup_video.cpp:429
+#: src/gui/widgets/tabs/setup_video.cpp:557
msgid "Alt FPS limit: "
msgstr "Alt FPS リミット: "
#. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:197
+#: src/gui/widgets/tabs/setup_video.cpp:201
msgid "Detect best mode"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:210
msgid "Show cursor"
msgstr "カーソルを表示"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:213
msgid "Custom cursor"
msgstr "カスタムカーソル"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:217
msgid "Enable resize"
msgstr "リサイズを有効ã«ã™ã‚‹"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:220
msgid "No frame"
msgstr "フレームãªã—"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:241
+#: src/gui/widgets/tabs/setup_video.cpp:427
+#: src/gui/widgets/tabs/setup_video.cpp:541
+#: src/gui/widgets/tabs/setup_video.cpp:554
msgid "None"
msgstr "ãªã—"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:349
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr "ウインドウモードã€ã¾ãŸå‰ãƒ¢ãƒ¼ãƒ‰ã®å¾©å…ƒã«ã‚‚失敗ã—ã¾ã—ãŸ"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:356
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr "フルスクリーンモードã€ã¾ãŸå‰ãƒ¢ãƒ¼ãƒ‰ã®å¾©å…ƒã«ã‚‚失敗ã—ã¾ã—ãŸ"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:368
msgid "Switching to Full Screen"
msgstr "フルスクリーンã«å¤‰æ›´"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:370
msgid "Restart needed for changes to take effect."
msgstr "設定変更ã®ç‚ºã€å†èµ·å‹•ã‚’ã—ã¦ãã ã•ã„"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:388
msgid "Changing to OpenGL"
msgstr "OpenGLã«å¤‰æ›´"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:390
msgid "Applying change to OpenGL requires restart."
msgstr "OpenGLã®è¨­å®šã‚’変更ã™ã‚‹ãŸã‚ã€å†èµ·å‹•ã‚’ã—ã¦ãã ã•ã„"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:468
msgid "Custom resolution (example: 1024x768)"
msgstr "カスタム解åƒåº¦ (例: 1024x768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:470
msgid "Enter new resolution: "
msgstr "解åƒåº¦ã‚’入力ã—ã¦ä¸‹ã•ã„: "
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:497
+#: src/gui/widgets/tabs/setup_video.cpp:506
msgid "Screen Resolution Changed"
msgstr "スクリーンã®è§£åƒåº¦ã‚’変更ã—ã¾ã—ãŸ"
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:500
msgid "Some windows may be moved to fit the lowered resolution."
msgstr "解åƒåº¦ã®å¤‰æ›´ã«åˆã‚ã›ã€ã„ãã¤ã‹ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãŒç§»å‹•ã™ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™"
@@ -4610,93 +4617,102 @@ msgid "on"
msgstr "オン"
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr "視覚"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr "通知"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr "入手通知をãƒãƒ£ãƒƒãƒˆã«è¡¨ç¤º"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr "入手通知をパーティクルã§è¡¨ç¤º"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr "効果"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr "マウスã¨ã‚­ãƒ¼ãƒœãƒ¼ãƒ‰å…¥åŠ›ã‚’グラブ"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr "テクスãƒãƒ£ãƒ¼ã‚’ã¼ã‹ã™ (OpenGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "GUIä¸é€æ˜Ž"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "ヘッダーテキスト"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "環境FX"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "最大"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr "パーティクルã®è©³ç´°"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr "パーティクルフィジックス"
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr "ガンマ"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr "ガンマコントロールを有効ã«ã™ã‚‹"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr "Vシンク"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr "スクリーンセーãƒãƒ¼ã‚’有効ã«ã™ã‚‹"
@@ -4813,7 +4829,7 @@ msgstr "EQU"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
#: src/gui/windows/inventorywindow.cpp:228
msgid "Equipment"
msgstr "装ç€å“"
@@ -5334,7 +5350,7 @@ msgid "Whispering to %s: %s"
msgstr "%sã«ã•ã•ã‚„ã中:%s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1607
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6087,12 +6103,12 @@ msgid "Error retreiving server list!"
msgstr "サーãƒãƒ¼ãƒªã‚¹ãƒˆã®èª­ã¿è¾¼ã¿ã«å¤±æ•—"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:638
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr "アップデートãŒå¿…è¦ã§ã™"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:643
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr "v%sãŒå¿…è¦"
@@ -7988,3 +8004,9 @@ msgstr "ä¸æ˜Žãªã‚¢ã‚¤ãƒ†ãƒ "
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
+
+#~ msgid "Stop Attack"
+#~ msgstr "攻撃を止ã‚ã‚‹"
+
+#~ msgid "Modifier key"
+#~ msgstr "モディファイアキー"
diff --git a/po/ka.po b/po/ka.po
index ff630f5a6..8c459c9fd 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/manaplus/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr ""
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr ""
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -496,8 +496,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -524,31 +524,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr ""
@@ -561,7 +561,7 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -570,32 +570,32 @@ msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -610,7 +610,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -623,65 +623,65 @@ msgid "Error"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -694,36 +694,36 @@ msgstr "უცნáƒáƒ‘ი კáƒáƒ›áƒáƒœáƒ“áƒ."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr ""
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -732,167 +732,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr ""
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -915,36 +927,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr ""
@@ -981,7 +993,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr ""
@@ -996,7 +1008,7 @@ msgstr ""
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1004,34 +1016,34 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1056,8 +1068,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1077,7 +1089,7 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1090,7 +1102,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1100,8 +1112,8 @@ msgstr ""
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1135,7 +1147,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1158,19 +1170,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1183,44 +1195,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1230,20 +1242,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1252,7 +1264,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1260,69 +1272,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1332,68 +1344,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1402,64 +1414,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1467,42 +1479,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1511,13 +1523,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1525,134 +1537,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1660,7 +1672,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1670,7 +1682,7 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
@@ -1678,14 +1690,14 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1693,7 +1705,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr ""
@@ -1701,48 +1713,48 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2405,7 +2417,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2573,7 +2585,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr ""
@@ -2707,13 +2719,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2793,7 +2805,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3402,12 +3414,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3456,14 +3468,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr ""
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr ""
@@ -3477,7 +3489,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr ""
@@ -3832,17 +3844,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4352,8 +4369,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr ""
@@ -4452,8 +4469,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4485,61 +4502,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4591,93 +4608,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr ""
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr ""
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5233,7 +5259,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr ""
@@ -5316,7 +5342,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6048,33 +6074,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6636,36 +6662,36 @@ msgid "Name: %s"
msgstr ""
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr ""
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr ""
@@ -6712,25 +6738,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6738,7 +6764,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7915,43 +7941,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr ""
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 585decbff..ec8540348 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: 2014-01-18 12:47+0300\n"
+"POT-Creation-Date: 2014-02-01 12:07+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"
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:327
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1933 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1938 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -525,31 +525,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1136 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1149 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr ""
@@ -562,7 +562,7 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1153 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -571,32 +571,32 @@ msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1278
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1364
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1489
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1529
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1542
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -611,7 +611,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1603 src/client.cpp:1614 src/client.cpp:1798
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -624,65 +624,65 @@ msgid "Error"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1626
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1667
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1669
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1691
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1693
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1716
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1718
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1995 src/client.cpp:2010 src/client.cpp:2055
-#: src/client.cpp:2071 src/client.cpp:2520 src/client.cpp:2528
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2227
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2268 src/client.cpp:2275
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2297 src/client.cpp:2314
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2978
+#: src/client.cpp:3000
msgid "Do you want to open support page?"
msgstr ""
@@ -695,36 +695,36 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr ""
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -733,167 +733,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr ""
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:906 src/commands.cpp:962
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1116
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1342
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1349
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1356
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1380 src/commands.cpp:1389
+#: src/commands.cpp:1476 src/commands.cpp:1485
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1383 src/commands.cpp:1392
+#: src/commands.cpp:1479 src/commands.cpp:1488
msgid "Resource orphaned images:"
msgstr ""
@@ -929,23 +941,23 @@ msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:573
+#: src/game.cpp:572
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:583
+#: src/game.cpp:582
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
msgid "Network Error"
msgstr ""
@@ -1059,7 +1071,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
-#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1912 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1171,7 +1183,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1797
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1253,7 +1265,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1405,7 +1417,7 @@ msgstr ""
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr ""
@@ -1470,7 +1482,7 @@ msgstr ""
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr ""
@@ -1661,9 +1673,9 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:680
+#: src/gui/windows/inventorywindow.cpp:682
msgid "Unequip"
msgstr ""
@@ -1672,7 +1684,7 @@ msgstr ""
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
@@ -1680,7 +1692,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:788
+#: src/gui/windows/inventorywindow.cpp:790
msgid "Drop..."
msgstr ""
@@ -1695,7 +1707,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:793
+#: src/gui/windows/inventorywindow.cpp:795
msgid "Drop"
msgstr ""
@@ -1784,7 +1796,7 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
+msgid "Stop Attack / Modifier key"
msgstr ""
#. TRANSLATORS: input action name
@@ -2300,100 +2312,95 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
msgid "Show onscreen keyboard"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
msgid "Move Keys"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
msgid "Move Up"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
msgid "Move Down"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
msgid "Move Left"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
msgid "Move Right"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
msgid "Move Forward"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
msgid "Move to navigation point shortcuts"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1440
-#: src/gui/setupactiondata.h:1446 src/gui/setupactiondata.h:1452
-#: src/gui/setupactiondata.h:1458 src/gui/setupactiondata.h:1464
-#: src/gui/setupactiondata.h:1470 src/gui/setupactiondata.h:1476
-#: src/gui/setupactiondata.h:1482 src/gui/setupactiondata.h:1488
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: src/gui/setupactiondata.h:1686 src/gui/setupactiondata.h:1692
-#: src/gui/setupactiondata.h:1698 src/gui/setupactiondata.h:1704
-#: src/gui/setupactiondata.h:1710 src/gui/setupactiondata.h:1716
+#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1434
+#: src/gui/setupactiondata.h:1440 src/gui/setupactiondata.h:1446
+#: src/gui/setupactiondata.h:1452 src/gui/setupactiondata.h:1458
+#: src/gui/setupactiondata.h:1464 src/gui/setupactiondata.h:1470
+#: src/gui/setupactiondata.h:1476 src/gui/setupactiondata.h:1482
+#: src/gui/setupactiondata.h:1488 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 src/gui/setupactiondata.h:1686
+#: src/gui/setupactiondata.h:1692 src/gui/setupactiondata.h:1698
+#: src/gui/setupactiondata.h:1704 src/gui/setupactiondata.h:1710
#, c-format
msgid "Move to point Shortcut %d"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
msgid "Move & selection"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
msgid "Move Home"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
msgid "Move End"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
msgid "Page up"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
msgid "Page down"
msgstr ""
@@ -2402,23 +2409,23 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1785 src/gui/setupactiondata.h:1930
+#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
msgid "Select"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
msgid "Select2"
msgstr ""
@@ -2428,7 +2435,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1809 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
#: src/gui/windows/charselectdialog.cpp:106
#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
#: src/gui/windows/shopwindow.cpp:100
@@ -2437,45 +2444,45 @@ msgid "Delete"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
msgid "Backspace"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
msgid "Insert"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
msgid "Tab"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
msgid "Mod"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
msgid "Ctrl"
msgstr ""
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
msgid "Basic"
msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1920 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
msgid "Shortcuts"
msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
#: src/gui/windowmenu.cpp:161
msgid "Windows"
msgstr ""
@@ -2483,7 +2490,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: emotes window name
#. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1924 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
#: src/gui/windows/emotewindow.cpp:107
msgid "Emotes"
msgstr ""
@@ -2491,13 +2498,13 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1928 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
msgid "Chat"
msgstr ""
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
msgid "Gui"
msgstr ""
@@ -2574,7 +2581,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr ""
@@ -2708,14 +2715,14 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
-#: src/gui/windows/inventorywindow.cpp:598
+#: src/gui/widgets/characterdisplay.cpp:136
+#: src/gui/windows/inventorywindow.cpp:600
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2794,7 +2801,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:339 src/gui/widgets/setupitem.cpp:475
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3457,14 +3464,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr ""
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr ""
@@ -3478,7 +3485,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr ""
@@ -4358,8 +4365,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:499
+#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr ""
@@ -4446,106 +4453,106 @@ msgid "Button %u action"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:190
msgid "Full screen"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
msgid "FPS limit:"
msgstr ""
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:194
-#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:198
+#: src/gui/widgets/tabs/setup_video.cpp:240
+#: src/gui/widgets/tabs/setup_video.cpp:429
+#: src/gui/widgets/tabs/setup_video.cpp:557
msgid "Alt FPS limit: "
msgstr ""
#. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:197
+#: src/gui/widgets/tabs/setup_video.cpp:201
msgid "Detect best mode"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:210
msgid "Show cursor"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:213
msgid "Custom cursor"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:217
msgid "Enable resize"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:220
msgid "No frame"
msgstr ""
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:241
+#: src/gui/widgets/tabs/setup_video.cpp:427
+#: src/gui/widgets/tabs/setup_video.cpp:541
+#: src/gui/widgets/tabs/setup_video.cpp:554
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:349
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:356
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:368
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:370
msgid "Restart needed for changes to take effect."
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:388
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:390
msgid "Applying change to OpenGL requires restart."
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:468
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:470
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:497
+#: src/gui/widgets/tabs/setup_video.cpp:506
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:500
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4597,93 +4604,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr ""
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr ""
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -4800,7 +4816,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
#: src/gui/windows/inventorywindow.cpp:228
msgid "Equipment"
msgstr ""
@@ -5321,7 +5337,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1607
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6076,12 +6092,12 @@ msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:638
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:643
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 139e028da..156403bcc 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/manaplus/language/nb/)\n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr ""
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr ""
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -497,8 +497,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -525,31 +525,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Hjelp"
@@ -562,7 +562,7 @@ msgstr "Hjelp"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -571,32 +571,32 @@ msgid "Close"
msgstr "Lukk"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -611,7 +611,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -624,65 +624,65 @@ msgid "Error"
msgstr "Feil"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -695,36 +695,36 @@ msgstr "Ukjent kommando"
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Kan ikke sende tomme meldinger!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -733,167 +733,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr ""
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -916,36 +928,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr "Generelt"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr "Lagring av skjermbilde feilet!"
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr "Nettverksfeil"
@@ -982,7 +994,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr ""
@@ -997,7 +1009,7 @@ msgstr ""
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1005,34 +1017,34 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1057,8 +1069,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1078,7 +1090,7 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1091,7 +1103,7 @@ msgstr "Kjøp"
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1101,8 +1113,8 @@ msgstr "Selg"
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1128,7 +1140,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1136,7 +1148,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1159,19 +1171,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1184,44 +1196,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "Avbryt"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr "Spillere"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1231,20 +1243,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1253,7 +1265,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1261,69 +1273,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1333,68 +1345,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1403,64 +1415,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1468,42 +1480,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Bruk"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1512,13 +1524,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1526,134 +1538,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1661,7 +1673,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1671,7 +1683,7 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
@@ -1679,14 +1691,14 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1694,7 +1706,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr ""
@@ -1702,48 +1714,48 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr "Del opp"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2406,7 +2418,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2574,7 +2586,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Partikkeleffekter"
@@ -2708,13 +2720,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2794,7 +2806,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3403,12 +3415,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3457,14 +3469,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "lav"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "medium"
@@ -3478,7 +3490,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "høy"
@@ -3833,17 +3845,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4353,8 +4370,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr ""
@@ -4453,8 +4470,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4486,61 +4503,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr "Endringer av OpenGL krever restart."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4592,93 +4609,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "GUI-gjennomsiktighet"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr ""
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "maks"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5234,7 +5260,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr ""
@@ -5317,7 +5343,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6051,33 +6077,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6639,36 +6665,36 @@ msgid "Name: %s"
msgstr "Navn: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr "Kobler til..."
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr ""
@@ -6715,25 +6741,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6741,7 +6767,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7918,43 +7944,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 7e7ead757..68c124f5b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+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"
@@ -20,12 +20,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr "Inkomende handelsaanvragen negeren"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr "Inkomende handelsaanvragen accepteren"
@@ -35,25 +35,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "ontwijk"
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr "mis"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -498,8 +498,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -526,31 +526,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Configureren"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Help"
@@ -563,7 +563,7 @@ msgstr "Help"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -572,32 +572,32 @@ msgid "Close"
msgstr "Sluiten"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Verbinden met server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Aanmelden"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Spelwereld binnengaan"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "Personages aanvragen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "Van spelserver wissellen"
@@ -612,7 +612,7 @@ msgstr "Van spelserver wissellen"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -625,65 +625,65 @@ msgid "Error"
msgstr "Fout"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "Registratiedetails aanvragen"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "Verander Wachtwoord"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "Wachtwoord veranderen geslaagd!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "Verander E-mail"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "E-mail veranderen geslaagd!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "Uitschrijven geslaagd!"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "Vaarwel, je mag altijd terugkomen..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s bestaat niet en kan niet worden aangemaakt! Sluiten."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Fout bij het creëren van de update map!"
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Fout: %s bestaat niet en kan niet worden aangemaakt! Sluiten."
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -696,36 +696,36 @@ msgstr "Onbekend commando."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Kan geen lege berichten sturen!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -734,167 +734,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Groepsnaam ontbreekt."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "Bericht sluit chat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Bericht sluit nu chat."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "vriend"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -917,36 +929,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr "Algemeen"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr "Opslaan van screenshot mislukt!"
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr "Netwerkfout"
@@ -983,7 +995,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr "Handel"
@@ -998,7 +1010,7 @@ msgstr "Handel"
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1006,34 +1018,34 @@ msgstr "Aanvallen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1058,8 +1070,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1079,7 +1091,7 @@ msgstr "Spreken"
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1092,7 +1104,7 @@ msgstr "Kopen"
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1102,8 +1114,8 @@ msgstr "Verkopen"
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1129,7 +1141,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1137,7 +1149,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1160,19 +1172,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1185,44 +1197,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "Annuleren"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr "Spelers"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1232,20 +1244,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1254,7 +1266,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1262,69 +1274,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1334,68 +1346,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1404,64 +1416,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Opslaan"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr "Afhalen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1469,42 +1481,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Gebruiken"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1513,13 +1525,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1527,134 +1539,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1662,7 +1674,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1672,7 +1684,7 @@ msgstr "Afdoen"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Uitrusten"
@@ -1680,14 +1692,14 @@ msgstr "Uitrusten"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1695,7 +1707,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr "Neerleggen"
@@ -1703,48 +1715,48 @@ msgstr "Neerleggen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr "Splitsen"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2407,7 +2419,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2575,7 +2587,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Deeltjes effecten"
@@ -2709,13 +2721,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2795,7 +2807,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3404,12 +3416,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3458,14 +3470,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "laag"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "gemiddeld"
@@ -3479,7 +3491,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "hoog"
@@ -3834,17 +3846,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4354,8 +4371,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr "Herstart de client om de wijzigingen in werking te doen treden."
@@ -4454,8 +4471,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4487,61 +4504,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr "De veranderingen worden pas actief na opnieuw opstarten"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4593,93 +4610,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Dekking van de GUI"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Omgevingseffecten"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "max"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5235,7 +5261,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr "Spelen"
@@ -5318,7 +5344,7 @@ msgid "Whispering to %s: %s"
msgstr "Fluisteren naar %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6052,33 +6078,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6640,36 +6666,36 @@ msgid "Name: %s"
msgstr "Naam: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr "Actualiseren..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr "Verbinden..."
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr "##1 Het updateproces is onvolledig."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr "##1 Het is ten sterkste aanbevolen dat"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr "Voltooid"
@@ -6716,25 +6742,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6742,7 +6768,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7919,43 +7945,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "naamloos"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr "Onbekend voorwerp"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index e312cf8f1..e0476bdc2 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: 2014-01-18 12:47+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+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"
@@ -37,25 +37,25 @@ msgid "Visible on map"
msgstr "Zichtbaar op de map"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:327
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "ontwijkt"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "miss"
msgstr "mist"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1933 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1938 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "I"
@@ -528,31 +528,31 @@ msgstr "Zwevende bel"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1136 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Configureren"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr "Thema"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1149 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Help"
@@ -565,7 +565,7 @@ msgstr "Help"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1153 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -574,32 +574,32 @@ msgid "Close"
msgstr "Sluiten"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1278
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Verbinden met server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Inloggen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1364
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1489
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "Aanvragen personage"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1529
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1542
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
@@ -614,7 +614,7 @@ msgstr "Wijzigen spelservers"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1603 src/client.cpp:1614 src/client.cpp:1798
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -627,65 +627,65 @@ msgid "Error"
msgstr "Fout"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1626
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1667
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "Paswoord Wijziging"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1669
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1691
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "Email Wijziging"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1693
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1716
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "Registratie ongedaan gemaakt!"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1718
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "Tot ziens..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1995 src/client.cpp:2010 src/client.cpp:2055
-#: src/client.cpp:2071 src/client.cpp:2520 src/client.cpp:2528
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2227
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2268 src/client.cpp:2275
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Fout bij het creëren van de update map!"
-#: src/client.cpp:2297 src/client.cpp:2314
+#: src/client.cpp:2299 src/client.cpp:2316
#, 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."
#. TRANSLATORS: error message question
-#: src/client.cpp:2978
+#: src/client.cpp:3000
msgid "Do you want to open support page?"
msgstr ""
@@ -698,36 +698,36 @@ msgstr "Onbekend commando."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr "Gelieve een naam te specifiëren"
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr "Speler reeds %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr "Speler succesvol %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr "Speler kan niet %s zijn!"
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Kan geen lege berichten sturen!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -738,167 +738,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Groepsnaam ontbreekt."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr "Guild-naam ontbreekt."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "Ga terug naar chat"
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "Bericht sluit chat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "Ga nu terug naar chat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Bericht sluit nu chat."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "vriend"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr "genegeerd"
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr "neutraal"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr "Speler is niet genegeerd!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr "Speler niet langer genegeerd!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr "Speler kan niet worden genegeerd!"
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr "vijand"
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr "Speler reeds verwijderd!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr "Speler succesvol verwijderd!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr "Speler kan niet worden verwijderd!"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:906 src/commands.cpp:962
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr "Client uptime: %s"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr "%d weken"
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr "%d dagen"
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr "%d uren"
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr "%d minuten"
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr "%d seconden"
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1116
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1342
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1349
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1356
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1380 src/commands.cpp:1389
+#: src/commands.cpp:1476 src/commands.cpp:1485
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1383 src/commands.cpp:1392
+#: src/commands.cpp:1479 src/commands.cpp:1488
msgid "Resource orphaned images:"
msgstr ""
@@ -935,23 +947,23 @@ msgid "Debug"
msgstr "Debug"
#. TRANSLATORS: save file message
-#: src/game.cpp:573
+#: src/game.cpp:572
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:583
+#: src/game.cpp:582
msgid "Saving screenshot failed!"
msgstr "Opslaan van screenshot mislukt!"
#. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
msgid "The connection to the server was lost."
msgstr "De verbinding met de server is verbroken."
#. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
msgid "Network Error"
msgstr "Netwerkfout"
@@ -1065,7 +1077,7 @@ msgstr "Nuke"
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
-#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1912 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "Beweeg"
@@ -1177,7 +1189,7 @@ msgstr "Naam aan het gesprek toevoegen"
#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1797
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1259,7 +1271,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1411,7 +1423,7 @@ msgstr ""
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Opslaan"
@@ -1476,7 +1488,7 @@ msgstr "Haal alles op"
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Gebruiken"
@@ -1667,9 +1679,9 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:680
+#: src/gui/windows/inventorywindow.cpp:682
msgid "Unequip"
msgstr "Afdoen"
@@ -1678,7 +1690,7 @@ msgstr "Afdoen"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Uitrusten"
@@ -1686,7 +1698,7 @@ msgstr "Uitrusten"
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:788
+#: src/gui/windows/inventorywindow.cpp:790
msgid "Drop..."
msgstr "Neerleggen..."
@@ -1701,7 +1713,7 @@ msgstr "Laat alles vallen"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:793
+#: src/gui/windows/inventorywindow.cpp:795
msgid "Drop"
msgstr "Neerleggen"
@@ -1790,8 +1802,8 @@ msgstr "Verplaats naar het navigatiepunt"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "Aanval stoppen"
+msgid "Stop Attack / Modifier key"
+msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:105
@@ -2306,100 +2318,95 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
msgid "Show onscreen keyboard"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
msgid "Move Keys"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
msgid "Move Up"
msgstr "Omhoog"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
msgid "Move Down"
msgstr "Omlaag"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
msgid "Move Left"
msgstr "Naar links"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
msgid "Move Right"
msgstr "Naar rechts"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
msgid "Move Forward"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
msgid "Move to navigation point shortcuts"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1440
-#: src/gui/setupactiondata.h:1446 src/gui/setupactiondata.h:1452
-#: src/gui/setupactiondata.h:1458 src/gui/setupactiondata.h:1464
-#: src/gui/setupactiondata.h:1470 src/gui/setupactiondata.h:1476
-#: src/gui/setupactiondata.h:1482 src/gui/setupactiondata.h:1488
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: src/gui/setupactiondata.h:1686 src/gui/setupactiondata.h:1692
-#: src/gui/setupactiondata.h:1698 src/gui/setupactiondata.h:1704
-#: src/gui/setupactiondata.h:1710 src/gui/setupactiondata.h:1716
+#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1434
+#: src/gui/setupactiondata.h:1440 src/gui/setupactiondata.h:1446
+#: src/gui/setupactiondata.h:1452 src/gui/setupactiondata.h:1458
+#: src/gui/setupactiondata.h:1464 src/gui/setupactiondata.h:1470
+#: src/gui/setupactiondata.h:1476 src/gui/setupactiondata.h:1482
+#: src/gui/setupactiondata.h:1488 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 src/gui/setupactiondata.h:1686
+#: src/gui/setupactiondata.h:1692 src/gui/setupactiondata.h:1698
+#: src/gui/setupactiondata.h:1704 src/gui/setupactiondata.h:1710
#, c-format
msgid "Move to point Shortcut %d"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
msgid "Move & selection"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
msgid "Move Home"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
msgid "Move End"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
msgid "Page up"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
msgid "Page down"
msgstr ""
@@ -2408,23 +2415,23 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1785 src/gui/setupactiondata.h:1930
+#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
msgstr "Andere"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
msgid "Select"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
msgid "Select2"
msgstr ""
@@ -2434,7 +2441,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1809 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
#: src/gui/windows/charselectdialog.cpp:106
#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
#: src/gui/windows/shopwindow.cpp:100
@@ -2443,45 +2450,45 @@ msgid "Delete"
msgstr "Verwijderen"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
msgid "Backspace"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
msgid "Insert"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
msgid "Tab"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
msgid "Mod"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
msgid "Ctrl"
msgstr ""
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
msgid "Basic"
msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1920 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
msgid "Shortcuts"
msgstr "Snelkoppeling"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
#: src/gui/windowmenu.cpp:161
msgid "Windows"
msgstr ""
@@ -2489,7 +2496,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: emotes window name
#. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1924 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
#: src/gui/windows/emotewindow.cpp:107
msgid "Emotes"
msgstr ""
@@ -2497,13 +2504,13 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1928 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
msgid "Chat"
msgstr "Chat"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
msgid "Gui"
msgstr ""
@@ -2580,7 +2587,7 @@ msgstr "Guild leden"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Deeltjes effecten"
@@ -2714,14 +2721,14 @@ msgstr "Wegpunt"
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
-#: src/gui/windows/inventorywindow.cpp:598
+#: src/gui/widgets/characterdisplay.cpp:136
+#: src/gui/windows/inventorywindow.cpp:600
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2800,7 +2807,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:339 src/gui/widgets/setupitem.cpp:475
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr "Wijzig"
@@ -3465,14 +3472,14 @@ msgstr "standaard"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "laag"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "gemiddeld"
@@ -3486,7 +3493,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "hoog"
@@ -3842,9 +3849,8 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:376
-#, fuzzy
msgid "Screenshot directory"
-msgstr "Schermafdruk"
+msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:381
@@ -4367,8 +4373,8 @@ msgstr "Thema is gewijzigd"
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:499
+#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "Herstart de client om de wijzigingen in werking te doen treden."
@@ -4455,59 +4461,59 @@ msgid "Button %u action"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:190
msgid "Full screen"
msgstr "Volledig scherm"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
msgid "FPS limit:"
msgstr "FPS limiet:"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:194
-#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:198
+#: src/gui/widgets/tabs/setup_video.cpp:240
+#: src/gui/widgets/tabs/setup_video.cpp:429
+#: src/gui/widgets/tabs/setup_video.cpp:557
msgid "Alt FPS limit: "
msgstr "Alt FPS limiet: "
#. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:197
+#: src/gui/widgets/tabs/setup_video.cpp:201
msgid "Detect best mode"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:210
msgid "Show cursor"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:213
msgid "Custom cursor"
msgstr "Aangepaste cursor"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:217
msgid "Enable resize"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:220
msgid "No frame"
msgstr ""
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:241
+#: src/gui/widgets/tabs/setup_video.cpp:427
+#: src/gui/widgets/tabs/setup_video.cpp:541
+#: src/gui/widgets/tabs/setup_video.cpp:554
msgid "None"
msgstr "Geen"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:349
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
@@ -4515,7 +4521,7 @@ msgstr ""
"faalde ook!"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:356
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
@@ -4523,42 +4529,42 @@ msgstr ""
"modus faalde ook!"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:368
msgid "Switching to Full Screen"
msgstr "Verwisselen naar Volledig Scherm"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:370
msgid "Restart needed for changes to take effect."
msgstr "De veranderingen worden pas actief na opnieuw opstarten"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:388
msgid "Changing to OpenGL"
msgstr "Verwisselen naar OpenGL"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:390
msgid "Applying change to OpenGL requires restart."
msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:468
msgid "Custom resolution (example: 1024x768)"
msgstr "Manuele resolutie (voorbeeld: 1024x768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:470
msgid "Enter new resolution: "
msgstr "Geef een nieuwe resolutie: "
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:497
+#: src/gui/widgets/tabs/setup_video.cpp:506
msgid "Screen Resolution Changed"
msgstr "Scherm Resolutie is gewijzigd"
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:500
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
@@ -4612,93 +4618,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Dekking van de GUI"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "Bovenhoofdse tekst"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Omgevingseffecten"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "max"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr "Deeltjesdetail"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -4818,7 +4833,7 @@ msgstr "UITR"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
#: src/gui/windows/inventorywindow.cpp:228
msgid "Equipment"
msgstr "Uitrusting"
@@ -5339,7 +5354,7 @@ msgid "Whispering to %s: %s"
msgstr "Fluisteren naar %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1607
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6094,12 +6109,12 @@ msgid "Error retreiving server list!"
msgstr "Fout tijdens ophalen server lijst"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:638
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr "vereist een nieuwere versie"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:643
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr "vereist v%s"
@@ -7999,3 +8014,6 @@ msgstr "Onbekend voorwerp"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
+
+#~ msgid "Stop Attack"
+#~ msgstr "Aanval stoppen"
diff --git a/po/pl.po b/po/pl.po
index 8204e44f5..88325a353 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-01-18 12:47+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
"pl/)\n"
@@ -40,25 +40,25 @@ msgid "Visible on map"
msgstr "Widoczne na mapie"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:327
+#: src/being/being.cpp:329
msgid "Human"
msgstr "Człowiek"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "Unik!"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "miss"
msgstr "Pudło!"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1933 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1938 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "I"
@@ -532,31 +532,31 @@ msgstr "Bąbelek nad głową"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1136 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Konfiguracja"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr "Wydajność"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Ekran"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr "Skórka"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1149 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Pomoc"
@@ -569,7 +569,7 @@ msgstr "Pomoc"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1153 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -578,32 +578,32 @@ msgid "Close"
msgstr "Zamknij"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1278
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "ÅÄ…czenie z serwerem"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Logowanie"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1364
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Wchodzenie do świata gry"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1489
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "Sprawdzanie postaci"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1529
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "ÅÄ…czenie siÄ™ z serwerem gry"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1542
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "Zmiana serwera"
@@ -618,7 +618,7 @@ msgstr "Zmiana serwera"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1603 src/client.cpp:1614 src/client.cpp:1798
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -631,65 +631,65 @@ msgid "Error"
msgstr "BÅ‚Ä…d"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1626
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "Sprawdzanie szczegółów rejestracji"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1667
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "Zmiana hasła"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1669
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "Hasło zmienione z powodzeniem!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1691
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "Zmiana adresu e-mail"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1693
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "Adres e-mail zmieniony z powodzeniem!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1716
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "Wyrejestrowano z powodzeniem"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1718
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "Żegnaj, będziemy czekać na Twój powrót..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1995 src/client.cpp:2010 src/client.cpp:2055
-#: src/client.cpp:2071 src/client.cpp:2520 src/client.cpp:2528
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
#, 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."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2227
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr "Nieprawidłowy host aktualizacyjny: %s"
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2268 src/client.cpp:2275
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "BÅ‚Ä…d podczas tworzenia katalogu aktualizacji!"
-#: src/client.cpp:2297 src/client.cpp:2314
+#: src/client.cpp:2299 src/client.cpp:2316
#, 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."
#. TRANSLATORS: error message question
-#: src/client.cpp:2978
+#: src/client.cpp:3000
msgid "Do you want to open support page?"
msgstr "Czy chcesz otworzyć stronę ze wsparciem/pomocą?"
@@ -702,36 +702,36 @@ msgstr "Nieznane polecenie."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr "Proszę wpisać prawidłową nazwę."
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr "Gracz jest już %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr "Gracz jest teraz %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr "Gracz nie może być %s!"
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Nie można wysłać pustych szeptów!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -741,167 +741,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr "Cache opróżnione"
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Brakuje nazwy grupy."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr "Brak nazwy gildii."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "Return włącza czat."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "Wiadomość zamyka czat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "Return od teraz włącza czat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Wiadomość od teraz zamyka czat."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "znajomy"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr "lekceważony"
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr "neutralny"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr "Gracz nie był ignorowany!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr "Gracz już nie jest ignorowany!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr "Gracz nie może być odignorowany!"
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr "dodany/a do czarnej listy"
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr "wróg"
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr "Gracz został usunięty!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr "Gracz usunięty z powodzeniem!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr "Gracz nie mógł zostać usunięty!"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:906 src/commands.cpp:962
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr "Czas pracy programu: %s"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr "%d tygodni/e"
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr "%d tygodni/e"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr "%d dni"
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr "%d dni"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr "%d godzin/y"
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr "%d godzin/y"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr "%d minut/y"
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr "%d minut/y"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr "%d sekund/y"
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr "%d sekund/y"
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1116
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr "Zmienne środowiskowe zostały zrzucone"
+#: src/commands.cpp:1342
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1349
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1356
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1380 src/commands.cpp:1389
+#: src/commands.cpp:1476 src/commands.cpp:1485
msgid "Resource images:"
msgstr "Obrazy źródłowe:"
#. TRANSLATORS: dump command
-#: src/commands.cpp:1383 src/commands.cpp:1392
+#: src/commands.cpp:1479 src/commands.cpp:1488
msgid "Resource orphaned images:"
msgstr "Osierocone obrazy źródłowe:"
@@ -937,23 +949,23 @@ msgid "Debug"
msgstr "Debug"
#. TRANSLATORS: save file message
-#: src/game.cpp:573
+#: src/game.cpp:572
#, c-format
msgid "Screenshot saved as %s"
msgstr "Zrzut ekranu zapisany jako %s"
#. TRANSLATORS: save file message
-#: src/game.cpp:583
+#: src/game.cpp:582
msgid "Saving screenshot failed!"
msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
#. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
msgid "The connection to the server was lost."
msgstr "Połączenie z serwerem zostało zerwane."
#. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
msgid "Network Error"
msgstr "BÅ‚Ä…d sieci"
@@ -1067,7 +1079,7 @@ msgstr "Wysadź w powietrze"
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
-#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1912 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "Podejdź"
@@ -1179,7 +1191,7 @@ msgstr "Wpisz do czatu"
#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1797
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1261,7 +1273,7 @@ msgstr "Przesuwaj kamerÄ™"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1413,7 +1425,7 @@ msgstr "Dodaj wszystko do handlu"
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Przechowaj"
@@ -1478,7 +1490,7 @@ msgstr "Odbierz wszystko"
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Użyj"
@@ -1669,9 +1681,9 @@ msgstr "Chroń przedmiot"
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:680
+#: src/gui/windows/inventorywindow.cpp:682
msgid "Unequip"
msgstr "Zdejmij"
@@ -1680,7 +1692,7 @@ msgstr "Zdejmij"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Załóż"
@@ -1688,7 +1700,7 @@ msgstr "Załóż"
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:788
+#: src/gui/windows/inventorywindow.cpp:790
msgid "Drop..."
msgstr "Upuść..."
@@ -1703,7 +1715,7 @@ msgstr "Upuść wszystko"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:793
+#: src/gui/windows/inventorywindow.cpp:795
msgid "Drop"
msgstr "Upuść"
@@ -1792,8 +1804,9 @@ msgstr "Podejdź do punktu nawigacyjnego"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "Zatrzymaj Atak"
+#, fuzzy
+msgid "Stop Attack / Modifier key"
+msgstr "Klawisze skrótów modyfikatorów"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:105
@@ -2308,100 +2321,95 @@ msgstr "Przełącz tryb kamery"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr "Klawisz modyfikatora"
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
msgid "Show onscreen keyboard"
msgstr "Pokaż klawiaturę ekranową"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
msgid "Move Keys"
msgstr "Klawisze poruszania siÄ™"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
msgid "Move Up"
msgstr "Idź do góry"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
msgid "Move Down"
msgstr "Idź w dół"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
msgid "Move Left"
msgstr "Idź w lewo"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
msgid "Move Right"
msgstr "Idź w prawo"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
msgid "Move Forward"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
msgid "Move to navigation point shortcuts"
msgstr "Przejdź to punktu skrótów nawigacyjnych"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1440
-#: src/gui/setupactiondata.h:1446 src/gui/setupactiondata.h:1452
-#: src/gui/setupactiondata.h:1458 src/gui/setupactiondata.h:1464
-#: src/gui/setupactiondata.h:1470 src/gui/setupactiondata.h:1476
-#: src/gui/setupactiondata.h:1482 src/gui/setupactiondata.h:1488
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: src/gui/setupactiondata.h:1686 src/gui/setupactiondata.h:1692
-#: src/gui/setupactiondata.h:1698 src/gui/setupactiondata.h:1704
-#: src/gui/setupactiondata.h:1710 src/gui/setupactiondata.h:1716
+#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1434
+#: src/gui/setupactiondata.h:1440 src/gui/setupactiondata.h:1446
+#: src/gui/setupactiondata.h:1452 src/gui/setupactiondata.h:1458
+#: src/gui/setupactiondata.h:1464 src/gui/setupactiondata.h:1470
+#: src/gui/setupactiondata.h:1476 src/gui/setupactiondata.h:1482
+#: src/gui/setupactiondata.h:1488 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 src/gui/setupactiondata.h:1686
+#: src/gui/setupactiondata.h:1692 src/gui/setupactiondata.h:1698
+#: src/gui/setupactiondata.h:1704 src/gui/setupactiondata.h:1710
#, c-format
msgid "Move to point Shortcut %d"
msgstr "Przejdź do punktu skrótu %d"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
msgid "Move & selection"
msgstr "Ruch i wybór"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
msgid "Move Home"
msgstr "Home"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
msgid "Move End"
msgstr "End"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
msgid "Page up"
msgstr "Page up"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
msgid "Page down"
msgstr "Page down"
@@ -2410,23 +2418,23 @@ msgstr "Page down"
#. TRANSLATORS: settings group
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1785 src/gui/setupactiondata.h:1930
+#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
msgstr "Inne"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
msgid "Select"
msgstr "Wybierz"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
msgid "Select2"
msgstr "Wybierz2"
@@ -2436,7 +2444,7 @@ msgstr "Wybierz2"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1809 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
#: src/gui/windows/charselectdialog.cpp:106
#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
#: src/gui/windows/shopwindow.cpp:100
@@ -2445,45 +2453,45 @@ msgid "Delete"
msgstr "Usuń"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
msgid "Backspace"
msgstr "Backspace"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
msgid "Insert"
msgstr "Insert"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
msgid "Tab"
msgstr "Tab"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
msgid "Mod"
msgstr "Mod"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
msgid "Ctrl"
msgstr ""
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
msgid "Basic"
msgstr "Podstawowe"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1920 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
msgid "Shortcuts"
msgstr "Skróty"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
#: src/gui/windowmenu.cpp:161
msgid "Windows"
msgstr "Okna"
@@ -2491,7 +2499,7 @@ msgstr "Okna"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: emotes window name
#. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1924 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
#: src/gui/windows/emotewindow.cpp:107
msgid "Emotes"
msgstr "Emotki"
@@ -2499,13 +2507,13 @@ msgstr "Emotki"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1928 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
msgid "Chat"
msgstr "Czat"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
msgid "Gui"
msgstr "GUI"
@@ -2582,7 +2590,7 @@ msgstr "Członkowie Gildii"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Efekty czÄ…steczkowe"
@@ -2716,14 +2724,14 @@ msgstr "Drogowskaz"
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr "Poziom: %u"
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
-#: src/gui/windows/inventorywindow.cpp:598
+#: src/gui/widgets/characterdisplay.cpp:136
+#: src/gui/windows/inventorywindow.cpp:600
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2802,7 +2810,7 @@ msgstr "Otwórz adres url"
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:339 src/gui/widgets/setupitem.cpp:475
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr "Edycja"
@@ -3467,14 +3475,14 @@ msgstr "domyślnie"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "niskie"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "średnie"
@@ -3488,7 +3496,7 @@ msgstr "tv"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "wysokie"
@@ -3844,9 +3852,8 @@ msgstr "Używaj FBO do screenshotów (tylko w OpenGL)"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:376
-#, fuzzy
msgid "Screenshot directory"
-msgstr "Zrzut ekranu"
+msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:381
@@ -4369,8 +4376,8 @@ msgstr "Skórka zmieniona"
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:499
+#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "Uruchom ponownie program, aby mogły zajść zmiany."
@@ -4457,66 +4464,66 @@ msgid "Button %u action"
msgstr "Działanie przycisku %u"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:190
msgid "Full screen"
msgstr "Pełny ekran"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
msgid "FPS limit:"
msgstr "Limit FPS:"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:194
-#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:198
+#: src/gui/widgets/tabs/setup_video.cpp:240
+#: src/gui/widgets/tabs/setup_video.cpp:429
+#: src/gui/widgets/tabs/setup_video.cpp:557
msgid "Alt FPS limit: "
msgstr "Alternatywny limit FPS:"
#. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:197
+#: src/gui/widgets/tabs/setup_video.cpp:201
msgid "Detect best mode"
msgstr "Wykryj najlepszy tryb"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:210
msgid "Show cursor"
msgstr "Pokaż kursor"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:213
msgid "Custom cursor"
msgstr "WÅ‚asny kursor"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:217
msgid "Enable resize"
msgstr "WÅ‚Ä…cz zmianÄ™ rozmiaru"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:220
msgid "No frame"
msgstr "Bez ramki"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:241
+#: src/gui/widgets/tabs/setup_video.cpp:427
+#: src/gui/widgets/tabs/setup_video.cpp:541
+#: src/gui/widgets/tabs/setup_video.cpp:554
msgid "None"
msgstr "Brak"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:349
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
"Nie udało się zmienić na tryb w oknie, ani przywrócić do poprzedniego stanu!"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:356
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
@@ -4524,42 +4531,42 @@ msgstr ""
"stanu!"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:368
msgid "Switching to Full Screen"
msgstr "Zmiana na tryb pełnoekranowy"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:370
msgid "Restart needed for changes to take effect."
msgstr "Wymagane ponowne uruchomienie aby zastosować zmiany."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:388
msgid "Changing to OpenGL"
msgstr "Zmiana na OpenGL"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:390
msgid "Applying change to OpenGL requires restart."
msgstr "Zastosowanie zmiany na OpenGL wymaga ponownego uruchomienia."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:468
msgid "Custom resolution (example: 1024x768)"
msgstr "Własna rozdzielczość (np. 1024x768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:470
msgid "Enter new resolution: "
msgstr "Wpisz nową rozdzielczość:"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:497
+#: src/gui/widgets/tabs/setup_video.cpp:506
msgid "Screen Resolution Changed"
msgstr "Rozdzielczość zmieniona"
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:500
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Niektóre okna mogą być przesunięte aby dopasować się do niższej "
@@ -4613,93 +4620,102 @@ msgid "on"
msgstr "włączone"
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr "Obraz"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr "Powiadomienia"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr "Pokazuj wiadomości o podnoszeniu w czacie"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr "Pokazuj wiadomości o podnoszeniu jako cząsteczki"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr "Efekty"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr "Przechwytuj sygnały z myszki i klawiatury"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr "Blurowanie tekstur (OpenGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Przezroczystość GUI"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "Tekst nad głową"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Efekty otoczenia"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "najlepsze"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr "Detale czÄ…steczkowe"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr "Fizyka czÄ…steczek"
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr "Gamma"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr "Aktywuj ustawienia gammy."
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr "Vsync"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr "Wycentruj okno gry"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr "Pozwól na włączanie się wygaszacza ekranu"
@@ -4816,7 +4832,7 @@ msgstr "EKW"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
#: src/gui/windows/inventorywindow.cpp:228
msgid "Equipment"
msgstr "Ekwipunek"
@@ -5342,7 +5358,7 @@ msgid "Whispering to %s: %s"
msgstr "Szepczesz do %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1607
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6099,12 +6115,12 @@ msgid "Error retreiving server list!"
msgstr "Błąd przy uzyskiwaniu listy serwerów!"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:638
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr "wymaga nowszej wersji"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:643
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr "wymaga v%s"
@@ -8012,3 +8028,9 @@ msgstr "Nieznany przedmiot"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
+
+#~ msgid "Stop Attack"
+#~ msgstr "Zatrzymaj Atak"
+
+#~ msgid "Modifier key"
+#~ msgstr "Klawisz modyfikatora"
diff --git a/po/pt.po b/po/pt.po
index 34d262b81..8ffb4a741 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-01-18 12:47+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
"language/pt/)\n"
@@ -38,25 +38,25 @@ msgid "Visible on map"
msgstr "Visivel no mapa"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:327
+#: src/being/being.cpp:329
msgid "Human"
msgstr "Humano"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "desviou"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "miss"
msgstr "errou"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1933 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1938 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "l"
@@ -529,31 +529,31 @@ msgstr "Bolha Flutuante"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1136 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Configurar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Vídeo"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1149 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Ajuda"
@@ -566,7 +566,7 @@ msgstr "Ajuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1153 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -575,32 +575,32 @@ msgid "Close"
msgstr "Fechar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1278
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Conectando ao servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Efetuando login"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1364
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Entrando no domínio do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1489
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "Requisitando personagens"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1529
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1542
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
@@ -615,7 +615,7 @@ msgstr "Mudando servidores do jogo"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1603 src/client.cpp:1614 src/client.cpp:1798
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -628,65 +628,65 @@ msgid "Error"
msgstr "Erro"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1626
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1667
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "Mudar senha"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1669
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1691
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "Mudar email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1693
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1716
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1718
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1995 src/client.cpp:2010 src/client.cpp:2055
-#: src/client.cpp:2071 src/client.cpp:2520 src/client.cpp:2528
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
#, 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."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2227
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2268 src/client.cpp:2275
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:2297 src/client.cpp:2314
+#: src/client.cpp:2299 src/client.cpp:2316
#, 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."
#. TRANSLATORS: error message question
-#: src/client.cpp:2978
+#: src/client.cpp:3000
msgid "Do you want to open support page?"
msgstr ""
@@ -699,36 +699,36 @@ msgstr "Comando desconhecido."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr "Por favor, especifique um nome."
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr "Jogador já %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr "Jogador %s com sucesso!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr "Jogador não pode ser %s!"
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Não é possível enviar mensagens privadas vazias!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -739,167 +739,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr "Cache limpo"
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Falta o nome do grupo."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr "Falta o nome da guilda."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "Enter alterna para o chat."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "A mensagem fecha o chat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "Agora Enter alterna para o chat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Agora a mensagem fecha o chat."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "amigo(a)"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr "ignorado"
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr "neutro"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr "O jogador não estava ignorado!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr "O jogador não está mais ignorado!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr "Não foi possível deixar de ignorar o jogador(a)!"
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr "Na Lista Negra"
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr "Inimigo"
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr "Jogador já apagado!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr "Jogador apagado com sucesso!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr "Jogador não pode ser apagado!"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:906 src/commands.cpp:962
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr "Uptime do cliente: %s"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr "%d semanas"
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr "%d semanas"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr "%d dias"
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr "%d dias"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr "%d horas"
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr "%d horas"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr "%d minutos"
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr "%d minutos"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr "%d segundos"
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr "%d segundos"
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1116
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr "Variáveis ​​de ambiente despejadas"
+#: src/commands.cpp:1342
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1349
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1356
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1380 src/commands.cpp:1389
+#: src/commands.cpp:1476 src/commands.cpp:1485
msgid "Resource images:"
msgstr "Recursos de imagens:"
#. TRANSLATORS: dump command
-#: src/commands.cpp:1383 src/commands.cpp:1392
+#: src/commands.cpp:1479 src/commands.cpp:1488
msgid "Resource orphaned images:"
msgstr "Recursos de imagens orfãos:"
@@ -936,23 +948,23 @@ msgid "Debug"
msgstr "Depurador"
#. TRANSLATORS: save file message
-#: src/game.cpp:573
+#: src/game.cpp:572
#, c-format
msgid "Screenshot saved as %s"
msgstr "Captura de Tela salva em: %s"
#. TRANSLATORS: save file message
-#: src/game.cpp:583
+#: src/game.cpp:582
msgid "Saving screenshot failed!"
msgstr "Falha ao salvar screenshot!"
#. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
msgid "The connection to the server was lost."
msgstr "A conexão com o servidor caiu."
#. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
msgid "Network Error"
msgstr "Erro de conexão"
@@ -1066,7 +1078,7 @@ msgstr "Desaparecer"
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
-#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1912 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "Mover"
@@ -1178,7 +1190,7 @@ msgstr "Adicionar nome ao chat"
#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1797
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1260,7 +1272,7 @@ msgstr "Mover câmera"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1412,7 +1424,7 @@ msgstr "Add. todos na negociação"
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Armazenar"
@@ -1477,7 +1489,7 @@ msgstr "Retirar tudo"
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Usar"
@@ -1668,9 +1680,9 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:680
+#: src/gui/windows/inventorywindow.cpp:682
msgid "Unequip"
msgstr "Desequipar"
@@ -1679,7 +1691,7 @@ msgstr "Desequipar"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Equipar"
@@ -1687,7 +1699,7 @@ msgstr "Equipar"
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:788
+#: src/gui/windows/inventorywindow.cpp:790
msgid "Drop..."
msgstr "Descartar..."
@@ -1702,7 +1714,7 @@ msgstr "Descartar tudo"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:793
+#: src/gui/windows/inventorywindow.cpp:795
msgid "Drop"
msgstr "Descartar"
@@ -1791,8 +1803,9 @@ msgstr "Mover para ponto de navegação"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "Parar ataque"
+#, fuzzy
+msgid "Stop Attack / Modifier key"
+msgstr "Atalhos de teclas midificadoras"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:105
@@ -2307,100 +2320,95 @@ msgstr "Alterar modo de camera"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr "Modificar chave"
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
msgid "Show onscreen keyboard"
msgstr "Mostrar teclado na tela"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
msgid "Move Keys"
msgstr "Teclas de movimento"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
msgid "Move Up"
msgstr "Mover para Cima"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
msgid "Move Down"
msgstr "Mover para Baixo"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
msgid "Move Left"
msgstr "Esquerda"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
msgid "Move Right"
msgstr "Direita"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
msgid "Move Forward"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
msgid "Move to navigation point shortcuts"
msgstr "Atalho para mover para ponto de navegação"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1440
-#: src/gui/setupactiondata.h:1446 src/gui/setupactiondata.h:1452
-#: src/gui/setupactiondata.h:1458 src/gui/setupactiondata.h:1464
-#: src/gui/setupactiondata.h:1470 src/gui/setupactiondata.h:1476
-#: src/gui/setupactiondata.h:1482 src/gui/setupactiondata.h:1488
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: src/gui/setupactiondata.h:1686 src/gui/setupactiondata.h:1692
-#: src/gui/setupactiondata.h:1698 src/gui/setupactiondata.h:1704
-#: src/gui/setupactiondata.h:1710 src/gui/setupactiondata.h:1716
+#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1434
+#: src/gui/setupactiondata.h:1440 src/gui/setupactiondata.h:1446
+#: src/gui/setupactiondata.h:1452 src/gui/setupactiondata.h:1458
+#: src/gui/setupactiondata.h:1464 src/gui/setupactiondata.h:1470
+#: src/gui/setupactiondata.h:1476 src/gui/setupactiondata.h:1482
+#: src/gui/setupactiondata.h:1488 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 src/gui/setupactiondata.h:1686
+#: src/gui/setupactiondata.h:1692 src/gui/setupactiondata.h:1698
+#: src/gui/setupactiondata.h:1704 src/gui/setupactiondata.h:1710
#, c-format
msgid "Move to point Shortcut %d"
msgstr "Mover para ponto %d"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
msgid "Move & selection"
msgstr "Move & Seleção"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
msgid "Move Home"
msgstr "Mover para Home"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
msgid "Move End"
msgstr "Mover para End"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
msgid "Page up"
msgstr "Page up"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
msgid "Page down"
msgstr "Page down"
@@ -2409,23 +2417,23 @@ msgstr "Page down"
#. TRANSLATORS: settings group
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1785 src/gui/setupactiondata.h:1930
+#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
msgstr "Outro"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
msgid "Select"
msgstr "Selecionar"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
msgid "Select2"
msgstr "Selecionar2"
@@ -2435,7 +2443,7 @@ msgstr "Selecionar2"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1809 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
#: src/gui/windows/charselectdialog.cpp:106
#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
#: src/gui/windows/shopwindow.cpp:100
@@ -2444,45 +2452,45 @@ msgid "Delete"
msgstr "Excluir"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
msgid "Backspace"
msgstr "Backspace"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
msgid "Insert"
msgstr "Inserir"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
msgid "Tab"
msgstr "Tab"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
msgid "Mod"
msgstr "Mod"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
msgid "Ctrl"
msgstr ""
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
msgid "Basic"
msgstr "Básico"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1920 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
msgid "Shortcuts"
msgstr "Atalhos"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
#: src/gui/windowmenu.cpp:161
msgid "Windows"
msgstr "Janelas"
@@ -2490,7 +2498,7 @@ msgstr "Janelas"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: emotes window name
#. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1924 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
#: src/gui/windows/emotewindow.cpp:107
msgid "Emotes"
msgstr "Emoções"
@@ -2498,13 +2506,13 @@ msgstr "Emoções"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1928 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
msgid "Chat"
msgstr "Chat"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
msgid "Gui"
msgstr "Gui"
@@ -2581,7 +2589,7 @@ msgstr "Membros da guilda"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Efeitos de partícula"
@@ -2715,14 +2723,14 @@ msgstr "Ponto de estrada"
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr "Level: %u"
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
-#: src/gui/windows/inventorywindow.cpp:598
+#: src/gui/widgets/characterdisplay.cpp:136
+#: src/gui/windows/inventorywindow.cpp:600
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2801,7 +2809,7 @@ msgstr "Abrir URL"
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:339 src/gui/widgets/setupitem.cpp:475
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr "Editar"
@@ -3466,14 +3474,14 @@ msgstr "padrão"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "Baixo"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "médio"
@@ -3487,7 +3495,7 @@ msgstr "tv"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "alto"
@@ -3843,9 +3851,8 @@ msgstr "Utilizar FBO para capturas de tela (apenas para opengl)"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:376
-#, fuzzy
msgid "Screenshot directory"
-msgstr "Screenshot"
+msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:381
@@ -4368,8 +4375,8 @@ msgstr "Tema alterado"
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:499
+#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "Reincie o cliente para que as mudanças surtam efeito."
@@ -4456,66 +4463,66 @@ msgid "Button %u action"
msgstr "Ação do botão %u"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:190
msgid "Full screen"
msgstr "Tela cheia"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
msgid "FPS limit:"
msgstr "Limite de FPS:"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:194
-#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:198
+#: src/gui/widgets/tabs/setup_video.cpp:240
+#: src/gui/widgets/tabs/setup_video.cpp:429
+#: src/gui/widgets/tabs/setup_video.cpp:557
msgid "Alt FPS limit: "
msgstr "Limite de FPS alternativo:"
#. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:197
+#: src/gui/widgets/tabs/setup_video.cpp:201
msgid "Detect best mode"
msgstr "Detectar melhor modo"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:210
msgid "Show cursor"
msgstr "Mostrar cursor"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:213
msgid "Custom cursor"
msgstr "Cursor customizado"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:217
msgid "Enable resize"
msgstr "Habilitar redirecionamento de janela"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:220
msgid "No frame"
msgstr "Sem moldura de janela"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:241
+#: src/gui/widgets/tabs/setup_video.cpp:427
+#: src/gui/widgets/tabs/setup_video.cpp:541
+#: src/gui/widgets/tabs/setup_video.cpp:554
msgid "None"
msgstr "Nenhum"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:349
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
"Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:356
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
@@ -4523,42 +4530,42 @@ msgstr ""
"anterior!"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:368
msgid "Switching to Full Screen"
msgstr "Mudando para tela cheia"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:370
msgid "Restart needed for changes to take effect."
msgstr "É preciso reiniciar para as mudanças terem efeito."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:388
msgid "Changing to OpenGL"
msgstr "Mudando para OpenGL"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:390
msgid "Applying change to OpenGL requires restart."
msgstr "Mudanças no OpenGL requerem o reinício do jogo."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:468
msgid "Custom resolution (example: 1024x768)"
msgstr "Resolução customizada (exemplo 1024x768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:470
msgid "Enter new resolution: "
msgstr "Escolha a nova resolução "
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:497
+#: src/gui/widgets/tabs/setup_video.cpp:506
msgid "Screen Resolution Changed"
msgstr "Resolução de tela alterada"
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:500
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
@@ -4611,93 +4618,102 @@ msgid "on"
msgstr "on"
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr "Visual"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr "Notificações"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr "Mostar notificações de coleta no chat"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr "Mostrar notificações de coleta como efeito de particulas"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr "Efeitos"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr "Pegue a entrada do mouse e teclado"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr "Texturas borradas (OpenGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Transparência de janelas"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "Texto sobrescrito como:"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Ambiente FX"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "máximo"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr "Detalhe de partículas"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr "Física de partículas"
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr "Gamma"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr "Habilitar controle de gamma"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr "Vsync"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr "Centro de janela do jogo"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr "Permitir proteção de tela"
@@ -4815,7 +4831,7 @@ msgstr "EQU"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
#: src/gui/windows/inventorywindow.cpp:228
msgid "Equipment"
msgstr "Equipamento"
@@ -5341,7 +5357,7 @@ msgid "Whispering to %s: %s"
msgstr "Enviando MP para %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1607
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6096,12 +6112,12 @@ msgid "Error retreiving server list!"
msgstr "Erro ao recuperar lista!"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:638
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr "requer uma versão mais nova"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:643
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr "requer v%s"
@@ -8006,3 +8022,9 @@ msgstr "Item desconhecido"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
+
+#~ msgid "Stop Attack"
+#~ msgstr "Parar ataque"
+
+#~ msgid "Modifier key"
+#~ msgstr "Modificar chave"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 5458e0bb2..918cc7c8d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-01-18 12:47+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+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"
@@ -44,25 +44,25 @@ msgid "Visible on map"
msgstr "Mapa visivel "
#. TRANSLATORS: default race name
-#: src/being/being.cpp:327
+#: src/being/being.cpp:329
msgid "Human"
msgstr "Humano"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "desviou"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "miss"
msgstr "errou"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1933 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1938 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "I"
@@ -535,31 +535,31 @@ msgstr "Bolha Flutuante"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1136 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Configurar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Vídeo"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1149 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Ajuda"
@@ -572,7 +572,7 @@ msgstr "Ajuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1153 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -581,32 +581,32 @@ msgid "Close"
msgstr "Fechar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1278
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Conectando-se ao servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Fazendo login"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1364
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Entrando no mundo do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1489
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "Requerindo personagens"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1529
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1542
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "Mudando de servidor do jogo"
@@ -621,7 +621,7 @@ msgstr "Mudando de servidor do jogo"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1603 src/client.cpp:1614 src/client.cpp:1798
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -634,65 +634,65 @@ msgid "Error"
msgstr "Erro"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1626
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1667
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "Mudar senha"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1669
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1691
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "Mudar email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1693
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1716
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1718
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "Adeus, volte sempre..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1995 src/client.cpp:2010 src/client.cpp:2055
-#: src/client.cpp:2071 src/client.cpp:2520 src/client.cpp:2528
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
#, 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."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2227
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr "Host de atualização inválido: %s."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2268 src/client.cpp:2275
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:2297 src/client.cpp:2314
+#: src/client.cpp:2299 src/client.cpp:2316
#, 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."
#. TRANSLATORS: error message question
-#: src/client.cpp:2978
+#: src/client.cpp:3000
msgid "Do you want to open support page?"
msgstr "Você quer abrir a página de suporte?"
@@ -705,36 +705,36 @@ msgstr "Comando desconhecido."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr "Por favor, especifique um nome."
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr "Jogador já %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr "Jogador %s com sucesso!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr "Jogador não pôde ser %s!"
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Não é possível enviar mensagens privadas vazias!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -745,167 +745,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr "Cache limpo"
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Falta o nome do grupo."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr "Falta o nome da guilda."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "Enter alterna para o chat."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "A mensagem fecha o chat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "Agora Enter alterna para o chat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Agora a mensagem fecha o chat."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "amigo(a)"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr "ignorado"
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr "neutro"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr "O jogador não estava ignorado!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr "O jogador não está mais sendo ignorado!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr "Não foi possível deixar de ignorar o jogador!"
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr "Na Lista Negra"
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr "inimigo"
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr "Jogador já apagado!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr "Jogador apagado com sucesso!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr "Jogador não pôde ser apagado!"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:906 src/commands.cpp:962
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr "Uptime do cliente: %s"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr "%d semanas"
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr "%d Semanas"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr "%d dias"
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr "%d Dias"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr "%d horas"
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr "%d Horas"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr "%d minutos"
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr "%d Minutos"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr "%d segundos"
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr "%d Segundos"
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1116
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr "Variáveis de ambiente despejada"
+#: src/commands.cpp:1342
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1349
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1356
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1380 src/commands.cpp:1389
+#: src/commands.cpp:1476 src/commands.cpp:1485
msgid "Resource images:"
msgstr "Recursos de imagem:"
#. TRANSLATORS: dump command
-#: src/commands.cpp:1383 src/commands.cpp:1392
+#: src/commands.cpp:1479 src/commands.cpp:1488
msgid "Resource orphaned images:"
msgstr "Recurso de imagem orfão:"
@@ -942,23 +954,23 @@ msgid "Debug"
msgstr "Depurador"
#. TRANSLATORS: save file message
-#: src/game.cpp:573
+#: src/game.cpp:572
#, c-format
msgid "Screenshot saved as %s"
msgstr "Captura de Tela salva em %s"
#. TRANSLATORS: save file message
-#: src/game.cpp:583
+#: src/game.cpp:582
msgid "Saving screenshot failed!"
msgstr "Falha ao salvar screenshot!"
#. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
msgid "The connection to the server was lost."
msgstr "A conexão com o servidor caiu."
#. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
msgid "Network Error"
msgstr "Erro de conexão"
@@ -1072,7 +1084,7 @@ msgstr "Desaparecer"
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
-#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1912 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "Mover"
@@ -1184,7 +1196,7 @@ msgstr "Adicionar nome ao chat"
#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1797
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1266,7 +1278,7 @@ msgstr "Mover câmera "
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1418,7 +1430,7 @@ msgstr "Add. todos na negociação"
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Armazenar"
@@ -1483,7 +1495,7 @@ msgstr "Retirar tudo"
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Usar"
@@ -1674,9 +1686,9 @@ msgstr "Proteger item"
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:680
+#: src/gui/windows/inventorywindow.cpp:682
msgid "Unequip"
msgstr "Desequipar"
@@ -1685,7 +1697,7 @@ msgstr "Desequipar"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Equipar"
@@ -1693,7 +1705,7 @@ msgstr "Equipar"
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:788
+#: src/gui/windows/inventorywindow.cpp:790
msgid "Drop..."
msgstr "Descartar..."
@@ -1708,7 +1720,7 @@ msgstr "Descartar tudo"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:793
+#: src/gui/windows/inventorywindow.cpp:795
msgid "Drop"
msgstr "Descartar"
@@ -1797,8 +1809,9 @@ msgstr "Mover para ponto de navegação"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "Parar ataque"
+#, fuzzy
+msgid "Stop Attack / Modifier key"
+msgstr "Teclas de atalho modificadoras"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:105
@@ -2313,100 +2326,95 @@ msgstr "Alterar modo de camera"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr "Chave de modificação"
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
msgid "Show onscreen keyboard"
msgstr "Mostrar teclado virtual"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
msgid "Move Keys"
msgstr "Tecla de movimento"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
msgid "Move Up"
msgstr "Mover para Cima"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
msgid "Move Down"
msgstr "Mover para Baixo"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
msgid "Move Left"
msgstr "Esquerda"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
msgid "Move Right"
msgstr "Direita"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
msgid "Move Forward"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
msgid "Move to navigation point shortcuts"
msgstr "Atalhos de ponto de navegação"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1440
-#: src/gui/setupactiondata.h:1446 src/gui/setupactiondata.h:1452
-#: src/gui/setupactiondata.h:1458 src/gui/setupactiondata.h:1464
-#: src/gui/setupactiondata.h:1470 src/gui/setupactiondata.h:1476
-#: src/gui/setupactiondata.h:1482 src/gui/setupactiondata.h:1488
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: src/gui/setupactiondata.h:1686 src/gui/setupactiondata.h:1692
-#: src/gui/setupactiondata.h:1698 src/gui/setupactiondata.h:1704
-#: src/gui/setupactiondata.h:1710 src/gui/setupactiondata.h:1716
+#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1434
+#: src/gui/setupactiondata.h:1440 src/gui/setupactiondata.h:1446
+#: src/gui/setupactiondata.h:1452 src/gui/setupactiondata.h:1458
+#: src/gui/setupactiondata.h:1464 src/gui/setupactiondata.h:1470
+#: src/gui/setupactiondata.h:1476 src/gui/setupactiondata.h:1482
+#: src/gui/setupactiondata.h:1488 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 src/gui/setupactiondata.h:1686
+#: src/gui/setupactiondata.h:1692 src/gui/setupactiondata.h:1698
+#: src/gui/setupactiondata.h:1704 src/gui/setupactiondata.h:1710
#, c-format
msgid "Move to point Shortcut %d"
msgstr "Mover para o atalho %d"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
msgid "Move & selection"
msgstr "Move & seleção"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
msgid "Move Home"
msgstr "Mover para Home"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
msgid "Move End"
msgstr "Mover para End"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
msgid "Page up"
msgstr "Page up"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
msgid "Page down"
msgstr "Page down"
@@ -2415,23 +2423,23 @@ msgstr "Page down"
#. TRANSLATORS: settings group
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1785 src/gui/setupactiondata.h:1930
+#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
msgstr "Outro"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
msgid "Select"
msgstr "Selecionar"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
msgid "Select2"
msgstr "Selecionar2"
@@ -2441,7 +2449,7 @@ msgstr "Selecionar2"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1809 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
#: src/gui/windows/charselectdialog.cpp:106
#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
#: src/gui/windows/shopwindow.cpp:100
@@ -2450,45 +2458,45 @@ msgid "Delete"
msgstr "Excluir"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
msgid "Backspace"
msgstr "Backspace"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
msgid "Insert"
msgstr "Inserir"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
msgid "Tab"
msgstr "Tab"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
msgid "Mod"
msgstr "Mod"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
msgid "Ctrl"
msgstr ""
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
msgid "Basic"
msgstr "Básico"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1920 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
msgid "Shortcuts"
msgstr "Atalhos"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
#: src/gui/windowmenu.cpp:161
msgid "Windows"
msgstr "Janelas"
@@ -2496,7 +2504,7 @@ msgstr "Janelas"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: emotes window name
#. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1924 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
#: src/gui/windows/emotewindow.cpp:107
msgid "Emotes"
msgstr "Emoções"
@@ -2504,13 +2512,13 @@ msgstr "Emoções"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1928 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
msgid "Chat"
msgstr "Chat"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
msgid "Gui"
msgstr "Gui"
@@ -2587,7 +2595,7 @@ msgstr "Membros da guilda"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Efeitos de partícula"
@@ -2721,14 +2729,14 @@ msgstr "Ponto de estrada"
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr "Level: %u"
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
-#: src/gui/windows/inventorywindow.cpp:598
+#: src/gui/widgets/characterdisplay.cpp:136
+#: src/gui/windows/inventorywindow.cpp:600
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2807,7 +2815,7 @@ msgstr "Abrir URL"
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:339 src/gui/widgets/setupitem.cpp:475
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr "Editar"
@@ -3472,14 +3480,14 @@ msgstr "padrão"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "baixo"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "médio"
@@ -3493,7 +3501,7 @@ msgstr "tv"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "alto"
@@ -3849,9 +3857,8 @@ msgstr "Utilizar FBO para capturas de tela (apenas para opengl)"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:376
-#, fuzzy
msgid "Screenshot directory"
-msgstr "Screenshot"
+msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:381
@@ -4375,8 +4382,8 @@ msgstr "Tema alterado"
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:499
+#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "Reincie o cliente para que as mudanças surtam efeito."
@@ -4463,66 +4470,66 @@ msgid "Button %u action"
msgstr "Ação do botão %u"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:190
msgid "Full screen"
msgstr "Tela cheia"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
msgid "FPS limit:"
msgstr "Limite de FPS:"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:194
-#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:198
+#: src/gui/widgets/tabs/setup_video.cpp:240
+#: src/gui/widgets/tabs/setup_video.cpp:429
+#: src/gui/widgets/tabs/setup_video.cpp:557
msgid "Alt FPS limit: "
msgstr "Limite de FPS alternativo: "
#. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:197
+#: src/gui/widgets/tabs/setup_video.cpp:201
msgid "Detect best mode"
msgstr "Detectar melhor modo"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:210
msgid "Show cursor"
msgstr "Mostrar Ponteiro"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:213
msgid "Custom cursor"
msgstr "Cursor customizado"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:217
msgid "Enable resize"
msgstr "Habilitar redimensionamento"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:220
msgid "No frame"
msgstr "Sem moldura de janela"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:241
+#: src/gui/widgets/tabs/setup_video.cpp:427
+#: src/gui/widgets/tabs/setup_video.cpp:541
+#: src/gui/widgets/tabs/setup_video.cpp:554
msgid "None"
msgstr "Nenhum"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:349
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
"Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:356
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
@@ -4530,42 +4537,42 @@ msgstr ""
"anterior!"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:368
msgid "Switching to Full Screen"
msgstr "Mudando para tela cheia"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:370
msgid "Restart needed for changes to take effect."
msgstr "É preciso reiniciar para as mudanças terem efeito."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:388
msgid "Changing to OpenGL"
msgstr "Mudando para OpenGL"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:390
msgid "Applying change to OpenGL requires restart."
msgstr "Mudanças no OpenGL requerem o reinício do jogo."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:468
msgid "Custom resolution (example: 1024x768)"
msgstr "Resolução customizada (exemplo 1024x768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:470
msgid "Enter new resolution: "
msgstr "Escolha a nova resolução "
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:497
+#: src/gui/widgets/tabs/setup_video.cpp:506
msgid "Screen Resolution Changed"
msgstr "Resolução de tela alterada"
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:500
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
@@ -4618,93 +4625,102 @@ msgid "on"
msgstr "on"
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr "Visual"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr "Notificações"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr "Mostrar notificações de coleta no bate-papo"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr "Mostrar notificações de coleta como particula"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr "Efeitos"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr "Pegue a entrada do mouse e teclado"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr "Texturas borradas (OpenGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Transparência de janelas"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "Texto sobrescrito como:"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Ambiente FX"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "máximo"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr "Detalhe de partículas"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr "Física de partículas"
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr "Gamma"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr "Habilitar controle gamma"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr "Vsync"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr "Centro da janela de jogo"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr "Permitir rodar proteção de tela"
@@ -4822,7 +4838,7 @@ msgstr "EQU"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
#: src/gui/windows/inventorywindow.cpp:228
msgid "Equipment"
msgstr "Equipamento"
@@ -5348,7 +5364,7 @@ msgid "Whispering to %s: %s"
msgstr "Enviando MP para %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1607
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6103,12 +6119,12 @@ msgid "Error retreiving server list!"
msgstr "Erro ao recuperar lista!"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:638
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr "requer uma versão mais nova"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:643
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr "requer v%s"
@@ -8012,3 +8028,9 @@ msgstr "Item desconhecido"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
+
+#~ msgid "Stop Attack"
+#~ msgstr "Parar ataque"
+
+#~ msgid "Modifier key"
+#~ msgstr "Chave de modificação"
diff --git a/po/ru.po b/po/ru.po
index 35be2a9ec..e39d48f42 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-01-18 12:47+0300\n"
-"PO-Revision-Date: 2014-01-11 08:35+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
"language/ru/)\n"
@@ -43,25 +43,25 @@ msgid "Visible on map"
msgstr "Видимые на карте"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:327
+#: src/being/being.cpp:329
msgid "Human"
msgstr "Человек"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "уклонение"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "miss"
msgstr "промах"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1933 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "О"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1938 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "Б"
@@ -535,31 +535,31 @@ msgstr "Плавающий пузырек"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1136 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "ÐаÑтройка"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr "ПроизводительноÑÑ‚ÑŒ"
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Видео"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr "Тема"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1149 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Помощь"
@@ -572,7 +572,7 @@ msgstr "Помощь"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1153 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -581,32 +581,32 @@ msgid "Close"
msgstr "Закрыть"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1278
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Идет подключение к Ñерверу..."
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "ÐвторизациÑ"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1364
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Входим в игровой мир"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1489
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "Получение ÑпиÑка перÑонажей"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1529
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "Подключение к игровому Ñерверу"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1542
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "Смена игрового Ñервера"
@@ -621,7 +621,7 @@ msgstr "Смена игрового Ñервера"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1603 src/client.cpp:1614 src/client.cpp:1798
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -634,65 +634,65 @@ msgid "Error"
msgstr "Ошибка"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1626
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ñ€ÐµÐ³Ð¸Ñтрационных данных"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1667
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "Изменить Пароль"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1669
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "Пароль изменен!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1691
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "Сменить Email"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1693
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "Email изменен!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1716
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð°"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1718
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "Хорошо, возвращайтеÑÑŒ в любое времÑ..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1995 src/client.cpp:2010 src/client.cpp:2055
-#: src/client.cpp:2071 src/client.cpp:2520 src/client.cpp:2528
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s не ÑущеÑтвует, и не может быть Ñоздано! Выход."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2227
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr "Ðекорректный Ñервер обновленмй: %s."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2268 src/client.cpp:2275
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ð¸ Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ð¹!"
-#: src/client.cpp:2297 src/client.cpp:2314
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Ошибка: %s не ÑущеÑтвует, и не может быть Ñоздан! Выход."
#. TRANSLATORS: error message question
-#: src/client.cpp:2978
+#: src/client.cpp:3000
msgid "Do you want to open support page?"
msgstr "Открыть Ñтраницу поддержки?"
@@ -705,36 +705,36 @@ msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr "ПожалуйÑта, укажите имÑ"
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr "Игрок уже %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr "Игрок удачно %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr "Игрок не может быть %s!"
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ пуÑтые ÑообщениÑ!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -745,167 +745,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr "Кеш очищен"
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Ðе указано название группы"
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr "Ðе задано Ð¸Ð¼Ñ Ð³Ð¸Ð»ÑŒÐ´Ð¸Ð¸."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "Enter переключает Ð’Ð°Ñ Ð½Ð° окно чата."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "Сообщение закрывает чат."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "Теперь Return переключает чат."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Теперь Ñообщение закрывает чат."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "друг"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr "пренебрегаемый"
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr "нейтральный"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr "Игрок не был игнорируемым!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr "Игрок больше не игнорируетÑÑ!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr "Игрок не может быть удален из ÑпиÑка игнорированиÑ!"
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr "добавлен в черный ÑпиÑок"
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr "враг"
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr "Игрок и так уже удален!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr "Игрок удален!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr "Игрок не может быть удален!"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:906 src/commands.cpp:962
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr "Ð’Ñ€ÐµÐ¼Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ клиента: %s"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr "%d неделÑ"
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr "%d недель"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr "%d день"
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr "%d дней"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr "%d чаÑ"
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr "%d чаÑов"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr "%d минута"
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr "%d минут"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr "%d Ñекунда"
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr "%d Ñекунд"
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1116
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr "Переменные Ñреды Ñохранены"
+#: src/commands.cpp:1342
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1349
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1356
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1380 src/commands.cpp:1389
+#: src/commands.cpp:1476 src/commands.cpp:1485
msgid "Resource images:"
msgstr "Изображений:"
#. TRANSLATORS: dump command
-#: src/commands.cpp:1383 src/commands.cpp:1392
+#: src/commands.cpp:1479 src/commands.cpp:1488
msgid "Resource orphaned images:"
msgstr "Удаленных изображений:"
@@ -943,23 +955,23 @@ msgid "Debug"
msgstr "Отладка"
#. TRANSLATORS: save file message
-#: src/game.cpp:573
+#: src/game.cpp:572
#, c-format
msgid "Screenshot saved as %s"
msgstr "Снимок Ñкрана Ñохранен как %s"
#. TRANSLATORS: save file message
-#: src/game.cpp:583
+#: src/game.cpp:582
msgid "Saving screenshot failed!"
msgstr "Ошибка при Ñохранении Ñнимка Ñкрана!"
#. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
msgid "The connection to the server was lost."
msgstr "Соединение Ñ Ñервером потерÑно."
#. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
msgid "Network Error"
msgstr "Ошибка Ñети"
@@ -1073,7 +1085,7 @@ msgstr "Уничтожить"
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
-#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1912 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "Движение"
@@ -1185,7 +1197,7 @@ msgstr "Добавить Ð¸Ð¼Ñ Ð² чат"
#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1797
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1267,7 +1279,7 @@ msgstr "Передвинуть камеру"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1419,7 +1431,7 @@ msgstr "Добавить к торговле вÑе"
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Сохранить"
@@ -1484,7 +1496,7 @@ msgstr "Получить вÑе"
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "ИÑпользовать"
@@ -1675,9 +1687,9 @@ msgstr "ПоÑтавить защиту"
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:680
+#: src/gui/windows/inventorywindow.cpp:682
msgid "Unequip"
msgstr "СнÑÑ‚ÑŒ"
@@ -1686,7 +1698,7 @@ msgstr "СнÑÑ‚ÑŒ"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Ðадеть"
@@ -1694,7 +1706,7 @@ msgstr "Ðадеть"
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:788
+#: src/gui/windows/inventorywindow.cpp:790
msgid "Drop..."
msgstr "БроÑить..."
@@ -1709,7 +1721,7 @@ msgstr "БроÑить вÑе"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:793
+#: src/gui/windows/inventorywindow.cpp:795
msgid "Drop"
msgstr "БроÑить"
@@ -1798,8 +1810,9 @@ msgstr "Движение к навигационной точке"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "ОÑтановка атаки"
+#, fuzzy
+msgid "Stop Attack / Modifier key"
+msgstr "Модификаторы Ñрлыков"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:105
@@ -2314,100 +2327,95 @@ msgstr "Изменение режима камеры"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr "Кнопка-модификатор"
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
msgid "Show onscreen keyboard"
msgstr "Показывать Ñкранную клавиатуру"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
msgid "Move Keys"
msgstr "Кнопки движениÑ"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
msgid "Move Up"
msgstr "Движение вверх"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
msgid "Move Down"
msgstr "Движение вниз"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
msgid "Move Left"
msgstr "Движение влево"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
msgid "Move Right"
msgstr "Движение вправо"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
msgid "Move Forward"
msgstr "Движение вперед"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
msgid "Move to navigation point shortcuts"
msgstr "Кнопки Ð´Ð²Ð¸Ð¶ÐµÐ½Ð¸Ñ Ðº цели"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1440
-#: src/gui/setupactiondata.h:1446 src/gui/setupactiondata.h:1452
-#: src/gui/setupactiondata.h:1458 src/gui/setupactiondata.h:1464
-#: src/gui/setupactiondata.h:1470 src/gui/setupactiondata.h:1476
-#: src/gui/setupactiondata.h:1482 src/gui/setupactiondata.h:1488
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: src/gui/setupactiondata.h:1686 src/gui/setupactiondata.h:1692
-#: src/gui/setupactiondata.h:1698 src/gui/setupactiondata.h:1704
-#: src/gui/setupactiondata.h:1710 src/gui/setupactiondata.h:1716
+#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1434
+#: src/gui/setupactiondata.h:1440 src/gui/setupactiondata.h:1446
+#: src/gui/setupactiondata.h:1452 src/gui/setupactiondata.h:1458
+#: src/gui/setupactiondata.h:1464 src/gui/setupactiondata.h:1470
+#: src/gui/setupactiondata.h:1476 src/gui/setupactiondata.h:1482
+#: src/gui/setupactiondata.h:1488 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 src/gui/setupactiondata.h:1686
+#: src/gui/setupactiondata.h:1692 src/gui/setupactiondata.h:1698
+#: src/gui/setupactiondata.h:1704 src/gui/setupactiondata.h:1710
#, c-format
msgid "Move to point Shortcut %d"
msgstr "Перейти к точке %d"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
msgid "Move & selection"
msgstr "Движение и выбор"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
msgid "Move Home"
msgstr "Движение в начало"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
msgid "Move End"
msgstr "Движение в конец"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
msgid "Page up"
msgstr "Страница вверх"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
msgid "Page down"
msgstr "Страница вниз"
@@ -2416,23 +2424,23 @@ msgstr "Страница вниз"
#. TRANSLATORS: settings group
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1785 src/gui/setupactiondata.h:1930
+#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
msgstr "Другое"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
msgid "Select"
msgstr "Выбор"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
msgid "Select2"
msgstr "Выбор2"
@@ -2442,7 +2450,7 @@ msgstr "Выбор2"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1809 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
#: src/gui/windows/charselectdialog.cpp:106
#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
#: src/gui/windows/shopwindow.cpp:100
@@ -2451,45 +2459,45 @@ msgid "Delete"
msgstr "Удалить"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
msgid "Backspace"
msgstr "Удаление влево"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
msgid "Insert"
msgstr "Ð’Ñтавка"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
msgid "Tab"
msgstr "ТабулÑциÑ"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
msgid "Mod"
msgstr "Модификатор"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
msgid "Ctrl"
msgstr "Ctrl"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
msgid "Basic"
msgstr "ОÑновное"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1920 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
msgid "Shortcuts"
msgstr "ГорÑчие клавиши"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
#: src/gui/windowmenu.cpp:161
msgid "Windows"
msgstr "Окна"
@@ -2497,7 +2505,7 @@ msgstr "Окна"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: emotes window name
#. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1924 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
#: src/gui/windows/emotewindow.cpp:107
msgid "Emotes"
msgstr "Смайлы"
@@ -2505,13 +2513,13 @@ msgstr "Смайлы"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1928 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
msgid "Chat"
msgstr "Чат"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
msgid "Gui"
msgstr "ИнтерфейÑ"
@@ -2588,7 +2596,7 @@ msgstr "Члены гильдии"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Эффекты чаÑтиц"
@@ -2722,14 +2730,14 @@ msgstr "Точка дороги"
msgid "Tiles border"
msgstr "Бордюр тайлов"
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr "Уровень: %u"
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
-#: src/gui/windows/inventorywindow.cpp:598
+#: src/gui/widgets/characterdisplay.cpp:136
+#: src/gui/windows/inventorywindow.cpp:600
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2808,7 +2816,7 @@ msgstr "Открыть ÑÑылку"
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:339 src/gui/widgets/setupitem.cpp:475
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr "Изменить"
@@ -3473,14 +3481,14 @@ msgstr "По умолчанию"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "низ."
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "Ñредне"
@@ -3494,7 +3502,7 @@ msgstr "ТВ"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "выÑ."
@@ -3850,9 +3858,8 @@ msgstr "ИÑпользовать FBO Ð´Ð»Ñ Ñкриншотов (только Ð
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:376
-#, fuzzy
msgid "Screenshot directory"
-msgstr "Создание Ñкриншота"
+msgstr "Путь Ð´Ð»Ñ Ñнимков Ñкрана"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:381
@@ -4381,8 +4388,8 @@ msgstr "Тема изменена"
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:499
+#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "Перезагрузите игру дабы Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð²Ñтупили в Ñилу."
@@ -4469,59 +4476,59 @@ msgid "Button %u action"
msgstr "ДейÑтвие кнопки %u"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:190
msgid "Full screen"
msgstr "Ðа полный Ñкран"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
msgid "FPS limit:"
msgstr "Ограничить кадр/Ñ:"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:194
-#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:198
+#: src/gui/widgets/tabs/setup_video.cpp:240
+#: src/gui/widgets/tabs/setup_video.cpp:429
+#: src/gui/widgets/tabs/setup_video.cpp:557
msgid "Alt FPS limit: "
msgstr "Ðльтер. ограничить кадр/Ñ: "
#. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:197
+#: src/gui/widgets/tabs/setup_video.cpp:201
msgid "Detect best mode"
msgstr "Ðайти лучший режим"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:210
msgid "Show cursor"
msgstr "Показывать курÑов"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:213
msgid "Custom cursor"
msgstr "Игровой курÑор"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:217
msgid "Enable resize"
msgstr "Разрешить менÑÑ‚ÑŒ размер окна"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:220
msgid "No frame"
msgstr "Без рамки"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:241
+#: src/gui/widgets/tabs/setup_video.cpp:427
+#: src/gui/widgets/tabs/setup_video.cpp:541
+#: src/gui/widgets/tabs/setup_video.cpp:554
msgid "None"
msgstr "Ðет"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:349
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
@@ -4529,7 +4536,7 @@ msgstr ""
"удалоÑÑŒ!"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:356
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
@@ -4537,42 +4544,42 @@ msgstr ""
"также не удалоÑÑŒ!"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:368
msgid "Switching to Full Screen"
msgstr "Переключение в полноÑкранный режим"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:370
msgid "Restart needed for changes to take effect."
msgstr "Ð”Ð»Ñ Ð²ÑÑ‚ÑƒÐ¿Ð»ÐµÐ½Ð¸Ñ Ð² Ñилу выбранных наÑтроек требуетÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° игры."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:388
msgid "Changing to OpenGL"
msgstr "Переключение на OpenGL"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:390
msgid "Applying change to OpenGL requires restart."
msgstr "Ð”Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° OpenGL необходима перезагрузки игры."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:468
msgid "Custom resolution (example: 1024x768)"
msgstr "Свое разрешение (например: 1024х768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:470
msgid "Enter new resolution: "
msgstr "Введите новое разрешение: "
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:497
+#: src/gui/widgets/tabs/setup_video.cpp:506
msgid "Screen Resolution Changed"
msgstr "Разрешение Ñкрана изменено"
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:500
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
"Ðекоторые окна могут быть Ñдвинуты, чтобы умеÑтитьÑÑ Ð½Ð° Ñкране при меньшем "
@@ -4626,93 +4633,102 @@ msgid "on"
msgstr "вкл."
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr "Графика"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr "Информационные ÑообщениÑ"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr "Показывать в чате ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾ поднÑÑ‚Ñ‹Ñ… предметах"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr "Показывать ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾ поднÑÑ‚Ñ‹Ñ… предметах в виде Ñффектов"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr "Эффекты"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr "Захватывать ввод Ñ ÐºÐ»Ð°Ð²Ð¸Ð°Ñ‚ÑƒÑ€Ñ‹ и мыши"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr "Смазывать текÑтуры (OpenGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "ÐепрозрачноÑÑ‚ÑŒ интерфейÑа"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "ТекÑÑ‚ над головами"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Эффекты окружающей Ñреды"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "макÑ."
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr "Ð”ÐµÑ‚Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ñ‡Ð°Ñтиц"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr "Физика чаÑтиц"
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr "Гамма"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr "Включить гамма коррекцию"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr "Ð’ÐµÑ€Ñ‚Ð¸ÐºÐ°Ð»ÑŒÐ½Ð°Ñ ÑинхронизациÑ"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr "Центрировать игровое окно"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr "Разрешить запуÑк ÑкринÑейвера"
@@ -4831,7 +4847,7 @@ msgstr "СÐ"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
#: src/gui/windows/inventorywindow.cpp:228
msgid "Equipment"
msgstr "СнарÑжение"
@@ -5357,7 +5373,7 @@ msgid "Whispering to %s: %s"
msgstr "Вы прошептали %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1607
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr "животное %s'а"
@@ -6114,12 +6130,12 @@ msgid "Error retreiving server list!"
msgstr "Ðе удалоÑÑŒ получить ÑпиÑок Ñерверов!"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:638
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr "требуетÑÑ Ð±Ð¾Ð»ÐµÐµ Ð½Ð¾Ð²Ð°Ñ Ð²ÐµÑ€ÑиÑ"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:643
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr "требуетÑÑ v%s"
@@ -8018,3 +8034,9 @@ msgstr "ÐеизвеÑтный предмет"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr "животное"
+
+#~ msgid "Stop Attack"
+#~ msgstr "ОÑтановка атаки"
+
+#~ msgid "Modifier key"
+#~ msgstr "Кнопка-модификатор"
diff --git a/po/sk.po b/po/sk.po
index f5a80152d..3d96ccafa 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/manaplus/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr ""
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr ""
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -498,8 +498,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -526,31 +526,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Nastavenie"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Nápoveda"
@@ -563,7 +563,7 @@ msgstr "Nápoveda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -572,32 +572,32 @@ msgid "Close"
msgstr "Zatvoriť"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -612,7 +612,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -625,65 +625,65 @@ msgid "Error"
msgstr "Chyba"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -696,36 +696,36 @@ msgstr "Neznámy príkaz."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr ""
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -734,167 +734,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr ""
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -917,36 +929,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr ""
@@ -983,7 +995,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr ""
@@ -998,7 +1010,7 @@ msgstr ""
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1006,34 +1018,34 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1058,8 +1070,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1079,7 +1091,7 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1092,7 +1104,7 @@ msgstr "Kúpiť"
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1102,8 +1114,8 @@ msgstr "Predaj"
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1129,7 +1141,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1137,7 +1149,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1160,19 +1172,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1185,44 +1197,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "Zrušiť"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1232,20 +1244,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1254,7 +1266,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1262,69 +1274,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1334,68 +1346,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1404,64 +1416,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1469,42 +1481,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Použiť"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1513,13 +1525,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1527,134 +1539,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1662,7 +1674,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1672,7 +1684,7 @@ msgstr "Odstrojiť"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Vystrojiť"
@@ -1680,14 +1692,14 @@ msgstr "Vystrojiť"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1695,7 +1707,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr "Zahodiť"
@@ -1703,48 +1715,48 @@ msgstr "Zahodiť"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2407,7 +2419,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2575,7 +2587,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr ""
@@ -2709,13 +2721,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2795,7 +2807,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3404,12 +3416,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3458,14 +3470,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr ""
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr ""
@@ -3479,7 +3491,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr ""
@@ -3834,17 +3846,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4354,8 +4371,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr ""
@@ -4454,8 +4471,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4487,61 +4504,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4593,93 +4610,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr ""
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr ""
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5235,7 +5261,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr ""
@@ -5318,7 +5344,7 @@ msgid "Whispering to %s: %s"
msgstr "Nápoveda pre %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6054,33 +6080,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6642,36 +6668,36 @@ msgid "Name: %s"
msgstr "Meno: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr "Pripájam sa..."
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr ""
@@ -6718,25 +6744,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6744,7 +6770,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7921,43 +7947,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr ""
diff --git a/po/sq.po b/po/sq.po
index dd32ce8db..48ddcdf0e 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/manaplus/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr ""
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr ""
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -497,8 +497,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -525,31 +525,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr ""
@@ -562,7 +562,7 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -571,32 +571,32 @@ msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -611,7 +611,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -624,65 +624,65 @@ msgid "Error"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -695,36 +695,36 @@ msgstr "Unknown command > Komand e panjohur"
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr ""
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -733,167 +733,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr ""
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -916,36 +928,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr ""
@@ -982,7 +994,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr ""
@@ -997,7 +1009,7 @@ msgstr ""
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1005,34 +1017,34 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1057,8 +1069,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1078,7 +1090,7 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1091,7 +1103,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1101,8 +1113,8 @@ msgstr ""
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1128,7 +1140,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1136,7 +1148,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1159,19 +1171,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1184,44 +1196,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1231,20 +1243,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1253,7 +1265,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1261,69 +1273,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1333,68 +1345,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1403,64 +1415,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1468,42 +1480,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1512,13 +1524,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1526,134 +1538,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1661,7 +1673,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1671,7 +1683,7 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
@@ -1679,14 +1691,14 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1694,7 +1706,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr ""
@@ -1702,48 +1714,48 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2406,7 +2418,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2574,7 +2586,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr ""
@@ -2708,13 +2720,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2794,7 +2806,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3403,12 +3415,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3457,14 +3469,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr ""
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr ""
@@ -3478,7 +3490,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr ""
@@ -3833,17 +3845,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4353,8 +4370,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr ""
@@ -4453,8 +4470,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4486,61 +4503,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4592,93 +4609,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr ""
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr ""
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5234,7 +5260,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr ""
@@ -5317,7 +5343,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6051,33 +6077,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6639,36 +6665,36 @@ msgid "Name: %s"
msgstr ""
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr ""
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr ""
@@ -6715,25 +6741,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6741,7 +6767,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7918,43 +7944,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 71250317a..4f00ea55b 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Swedish (http://www.transifex.com/projects/p/manaplus/language/sv/)\n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr "Ignorerar handelserbjudanden"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr "Accepterar handelserbjudanden"
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -497,8 +497,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -525,31 +525,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Inställningar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Hjälp"
@@ -562,7 +562,7 @@ msgstr "Hjälp"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -571,32 +571,32 @@ msgid "Close"
msgstr "Stäng"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -611,7 +611,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -624,65 +624,65 @@ msgid "Error"
msgstr "Fel"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Kunde inte skapa katalog för uppdateringar!"
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -695,36 +695,36 @@ msgstr "Okänt kommando."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Behöver en text att viska!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -733,167 +733,179 @@ msgstr "Kan inte skapa viskningsflik för smeknamnet \"%s\"! Antingen existerar
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Du måste ange gruppens namn."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "Retur visar/döljer chattfönstret."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "Meddelande stänger chattfönstret."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "Retur växlar nu chattfönstrets synlighet."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Meddelanden stänger nu chattfönstret."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -916,36 +928,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr "Allmänt"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr "Kunde inte spara skärmbild!"
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr "Nätverksfel"
@@ -982,7 +994,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr "Byteshandla"
@@ -997,7 +1009,7 @@ msgstr "Byteshandla"
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1005,34 +1017,34 @@ msgstr "Attackera"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1057,8 +1069,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1078,7 +1090,7 @@ msgstr "Prata"
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1091,7 +1103,7 @@ msgstr "Köp"
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1101,8 +1113,8 @@ msgstr "Sälj"
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1128,7 +1140,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1136,7 +1148,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1159,19 +1171,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1184,44 +1196,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "Avbryt"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr "Spelare"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1231,20 +1243,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1253,7 +1265,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1261,69 +1273,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1333,68 +1345,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1403,64 +1415,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Lagra"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr "Hämta"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1468,42 +1480,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Använd"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1512,13 +1524,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1526,134 +1538,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1661,7 +1673,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1671,7 +1683,7 @@ msgstr "Avrusta"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Utrusta"
@@ -1679,14 +1691,14 @@ msgstr "Utrusta"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1694,7 +1706,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr "Släpp"
@@ -1702,48 +1714,48 @@ msgstr "Släpp"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr "Dela"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2406,7 +2418,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2574,7 +2586,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Partikeleffekter"
@@ -2708,13 +2720,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2794,7 +2806,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3403,12 +3415,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3457,14 +3469,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "låg"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "medium"
@@ -3478,7 +3490,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "hög"
@@ -3833,17 +3845,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4353,8 +4370,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr "Starta om din klient för att ändringen ska börja gälla."
@@ -4453,8 +4470,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4486,61 +4503,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr "Omstart krävs för att ändringarna ska synas."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr "Ändringar i OpenGL kräver omstart."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4592,93 +4609,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Genomskinlighet"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "Text ovanför huvudet"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Omgivande FX"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "maximal"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5234,7 +5260,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr "Spela"
@@ -5317,7 +5343,7 @@ msgid "Whispering to %s: %s"
msgstr "Viskar till %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6051,33 +6077,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6639,36 +6665,36 @@ msgid "Name: %s"
msgstr "Namn: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr "Uppdaterar..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr "Ansluter..."
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr "##1 Uppdateringsprocessen är inte avslutad."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr "##1 Det rekommenderar verkligen att"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr "Färdig"
@@ -6715,25 +6741,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6741,7 +6767,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7918,43 +7944,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "namnlös"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr "Okänt föremål"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 9b87178ce..819e042b7 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+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"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr "Ignorera inkommande bytes-förfrågningar"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr "Acceptera inkommande bytes-förfrågningar"
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr "Synlig på karta"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr "Människa"
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "undvika"
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr "missa"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "I"
@@ -497,8 +497,8 @@ msgstr "Du ser %s"
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr "Fullständigt ignorera"
@@ -525,31 +525,31 @@ msgstr "Floating bubble"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Inställningar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Hjälp"
@@ -562,7 +562,7 @@ msgstr "Hjälp"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -571,32 +571,32 @@ msgid "Close"
msgstr "Stäng"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Ansluter till server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Loggar in"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Går in i spelvärld"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "Begär karaktärer"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "Ansluter till spelservern"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "Ändrar spelserver"
@@ -611,7 +611,7 @@ msgstr "Ändrar spelserver"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -624,65 +624,65 @@ msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "Begär registreringsuppgifter"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "Lösenordsändring"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "Lösenordsändring har lyckats!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "Byte av E-post"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "E-posten har ändrats!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "Avregistrering lyckad"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "Farväl, kom gärna tillbaka snart igen..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s existerar inte och kan inte bli skapat! Avslutar."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr "Felaktig uppdaterings-host: %s."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Error uppstod då uppdateringskatalog skulle skapas!"
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Error: %s existerar inte och kan inte bli skapat! Avslutar."
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr "Vill du öppna support-sidan?"
@@ -695,36 +695,36 @@ msgstr "Ogiltigt kommando."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr "Var vänlig specificera ett namn."
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr "Spelare är redan %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr "Spelare %s lyckades!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr "Spelare kunde inte bli %s!"
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Det går inte skicka tomma viskningar!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -733,167 +733,179 @@ msgstr "Kan inte skapa en viskningsflik för nicket \"%s\"! Antingen existerar d
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr "Cache rensad"
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Gruppnamn saknas."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr "Guild-namn saknas."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "Enter för att växla chat."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "Meddelande stänger chat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "Enter nu, växlar chat."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Meddelande nu, stänger chat."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "vän"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr "ignorera"
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr "neutral"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr "Spelaren ignorerades inte!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr "Spelaren är inte längre ignorerad!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr "Spelaren kunde inte bli oignorerad!"
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr "blacklistad"
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr "enemy"
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr "Spelare är redan borttagen!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr "Spelaren lyckades tas bort!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr "Spelaren kunde inte tas bort!"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr "Klientupptid: %s"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr "%d vecka"
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr "%d veckor"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr "%d dag"
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr "%d dagar"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr "%d timme"
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr "%d timmar"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr "%d minut"
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr "%d minuter"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr "%d sekund"
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr "%d sekunder"
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr "Omgivningsvariabler dumpade"
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr "Resurs-bilder:"
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr "Föräldralösa resurs-bilder:"
@@ -916,36 +928,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr "General"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr "Debug"
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr "Skärmdump sparades som %s"
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr "Spara skärmdump misslyckades!"
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr "Anslutningen till servern förlorades."
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr "Nätverksfel"
@@ -982,7 +994,7 @@ msgstr "Vikt: %s"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr "Trade"
@@ -997,7 +1009,7 @@ msgstr "Trade"
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1005,34 +1017,34 @@ msgstr "Attackera"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr "Viska"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr "Hela"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr "Kicka från guild"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr "Ändra position i guild"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr "Bjud in till guild"
@@ -1057,8 +1069,8 @@ msgstr "Nuke"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "Flytta"
@@ -1078,7 +1090,7 @@ msgstr "Prata med"
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1091,7 +1103,7 @@ msgstr "Köp"
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1101,8 +1113,8 @@ msgstr "Sälj"
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1128,7 +1140,7 @@ msgstr "Lägg till i attacklistan"
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr "Lägg till i ignoreringslistan"
@@ -1136,7 +1148,7 @@ msgstr "Lägg till i ignoreringslistan"
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr "Lägg till namnet i chat"
@@ -1159,19 +1171,19 @@ msgstr "Lägg till namnet i chat"
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1184,44 +1196,44 @@ msgstr "Lägg till namnet i chat"
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "Avbryt"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr "Spelare"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr "Kicka från party"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr "Pick up"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr "Lägg till i chat"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr "Kartobjekt"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr "Ändra namn"
@@ -1231,20 +1243,20 @@ msgstr "Ändra namn"
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr "Ta bort"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr "Warpa"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr "Rör kamera"
@@ -1253,7 +1265,7 @@ msgstr "Rör kamera"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1261,69 +1273,69 @@ msgstr "Utstyrsel"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr "Rensa klädsel"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr "Spells"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr "Ändra spell"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr "Clear"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr "Inaktivera highlight"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr "Aktivera highlight"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr "Ta inte bort namn"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr "Ta bort namn"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr "Aktivera away"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr "Avaktivera away"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr "Lämna"
@@ -1333,68 +1345,68 @@ msgstr "Lämna"
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr "Kopiera till clipboard"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr "Bjud in till party"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr "Ändra guild-position"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr "Döp om kartskyltar"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr "Namn:"
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr "Lägg till för trade"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr "Lägg till 10 för trade"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr "Lägg till hälften för trade"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr "Lägg till trade alla-1"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr "Lägg till alla för trade"
@@ -1403,64 +1415,64 @@ msgstr "Lägg till alla för trade"
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Lagra"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr "Lagra 10"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr "Lagra hälften"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr "Lagra alla-1"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr "Lagra alla"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr "Ta emot"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr "Hämta ut 10"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr "Hämta ut hälften"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr "Hämta ut alla-1"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr "Hämta ut alla"
@@ -1468,42 +1480,42 @@ msgstr "Hämta ut alla"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Använd"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr "Rensa drop-fönster"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr "Döjl"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr "Visa"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr "Återställ yellow bar"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr "Kopiera till chat"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1512,13 +1524,13 @@ msgstr "(standard)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr "Flytta upp"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr "Flytta ner"
@@ -1526,134 +1538,134 @@ msgstr "Flytta ner"
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr "Klä av"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr "Kopiera"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr "Klistra in"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr "Öppna länk"
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr "Visa fönster"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr "Bli vän"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr "Ignorera"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr "Ignorera"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr "Black list"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr "Sätt som enemy"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr "Ta bort"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr "Av-ignorera"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr "Follow"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr "Imitation"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr "Köp (?)"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr "Sälj (?)"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr "Visa Items"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr "Ta bort från pickup-listan"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr "Lägg till i pickup-listan"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr "Skydda inte item"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr "Skydda item"
@@ -1661,7 +1673,7 @@ msgstr "Skydda item"
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1671,7 +1683,7 @@ msgstr "Unequip"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Equip"
@@ -1679,14 +1691,14 @@ msgstr "Equip"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr "Släng..."
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr "Släng allt"
@@ -1694,7 +1706,7 @@ msgstr "Släng allt"
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr "Släng"
@@ -1702,48 +1714,48 @@ msgstr "Släng"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr "Dela"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr "GM..."
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr "GM-kommandon"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr "Granska ip"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr "Goto"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr "Ã…terkalla"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr "Ã…teruppliva"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr "Sparka"
@@ -2406,7 +2418,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2574,7 +2586,7 @@ msgstr "Guild-medlemmar"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Partickeleffekter"
@@ -2708,13 +2720,13 @@ msgstr "Väg-märke"
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr "Level: %u"
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2794,7 +2806,7 @@ msgstr "Öppna url"
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr "Ändra"
@@ -3403,12 +3415,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr "Rotera stickan men rör inga knappar"
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3457,14 +3469,14 @@ msgstr "standard"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "låg"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "medium"
@@ -3478,7 +3490,7 @@ msgstr "tv"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "hög"
@@ -3833,17 +3845,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr "Använd FBO för skärmdumpar (bara för openGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr "Nätverksfördröjning mellan underservrar"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr "Visa bakgrund"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr "Skärmdensitet överskrids"
@@ -4353,8 +4370,8 @@ msgstr "Tema ändrat"
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr "Starta om din klient för att ändringarna ska utföras."
@@ -4453,8 +4470,8 @@ msgstr "FPS-begränsning:"
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr "Alternativ FPS-begränsning:"
@@ -4486,61 +4503,61 @@ msgstr "Ingen ram"
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr "Ingen"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr "Misslyckades att ändra till fönster-läge och återställandet av det gamla läget misslyckades också!"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr "Misslyckades att ändra till fullskärms-läge och återställandet av det gamla läget misslyckades också!"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr "Ändrar till Fullskärm"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr "Omstart behövs för att ändringar ska genomföras."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr "Ändrar till OpenGL"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr "Tillämpar ändringar till OpenGL, behöver omstart."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr "Anpassad upplösning (exempel: 1024x768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr "Skriv in ny upplösning:"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr "Skärmupplösning ändrad"
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr "Vissa fönster kan flyttas på för att passa i lägre upplösning."
@@ -4592,93 +4609,102 @@ msgid "on"
msgstr "på"
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr "Visuellt"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr "Notifikationer"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr "Visa pickup-notationer i chat"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr "Visa pickup-notationer som coola partickeleffekter"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr "Effekter"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr "FÃ¥nga mus och tangentbords-input"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr "Dimmiga texturer (OpenGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Gui-opacitet"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "Rubriktext"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Ambient FX"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "max"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr "Partikel-detalj"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr "Partikelfysik"
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr "Gamma"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr "Aktivera gamma-kontroll"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr "Vsync"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr "Centrera spelfönster"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr "Tillåt skärmsläckare att starta"
@@ -5234,7 +5260,7 @@ msgstr "Ändra inloggad"
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr "Spela"
@@ -5317,7 +5343,7 @@ msgid "Whispering to %s: %s"
msgstr "Viskar till %s: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6051,33 +6077,33 @@ msgid "Use same ip for game sub servers"
msgstr "Använd samma ip för spelunderservrar"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Laddar hem server-lista...%2.2f%%"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr "Väntar på server..."
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr "Förbereder hemladdning"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr "Fel uppstod när serverlistan hämtades!"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr "Nyare version behövs"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr "v%s behövs"
@@ -6639,36 +6665,36 @@ msgid "Name: %s"
msgstr "Namn: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr "Uppdaterar..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr "Ansluter..."
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr "##1 Uppdateringsprocessen är inte fullständig."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr "##1 Det är starkt rekommenderat att"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr "##1 du försöker senare igen."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr "Färdig"
@@ -6715,25 +6741,25 @@ msgstr "Välj värld"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr "key_%d"
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr "JButton%d"
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr "okänd eller borttappad tangent"
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr "JB%d"
@@ -6741,7 +6767,7 @@ msgstr "JB%d"
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr "u-tangenten"
@@ -7918,43 +7944,43 @@ msgstr "Säker OpenGL"
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "Inte namngiven"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr "Attack %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr "Defense %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr "HP %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr "MP %s"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr "Level %s"
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr "Okänt item"
diff --git a/po/te.po b/po/te.po
index 026a8789a..917189df7 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/manaplus/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr ""
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr ""
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -497,8 +497,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -525,31 +525,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "సహాయం"
@@ -562,7 +562,7 @@ msgstr "సహాయం"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -571,32 +571,32 @@ msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -611,7 +611,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -624,65 +624,65 @@ msgid "Error"
msgstr "పొరపాటà±"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -695,36 +695,36 @@ msgstr "à°—à±à°°à±à°¤à±à°¤à±†à°²à°¿à°¯à°¨à°¿ ఆదేశం."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr ""
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -733,167 +733,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr ""
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -916,36 +928,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr "సాధారణ"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr ""
@@ -982,7 +994,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr ""
@@ -997,7 +1009,7 @@ msgstr ""
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1005,34 +1017,34 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1057,8 +1069,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1078,7 +1090,7 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1091,7 +1103,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1101,8 +1113,8 @@ msgstr ""
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1128,7 +1140,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1136,7 +1148,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1159,19 +1171,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1184,44 +1196,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "à°°à°¦à±à°¦à±à°šà±‡à°¯à°¿"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr "ఆటగాళà±à°³à±"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1231,20 +1243,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1253,7 +1265,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1261,69 +1273,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1333,68 +1345,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1403,64 +1415,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1468,42 +1480,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1512,13 +1524,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1526,134 +1538,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1661,7 +1673,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1671,7 +1683,7 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
@@ -1679,14 +1691,14 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1694,7 +1706,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr ""
@@ -1702,48 +1714,48 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2406,7 +2418,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2574,7 +2586,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr ""
@@ -2708,13 +2720,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2794,7 +2806,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3403,12 +3415,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3457,14 +3469,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr ""
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr ""
@@ -3478,7 +3490,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr ""
@@ -3833,17 +3845,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4353,8 +4370,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr ""
@@ -4453,8 +4470,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4486,61 +4503,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4592,93 +4609,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr ""
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "à°—à°°à°¿à°·à±à° "
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5234,7 +5260,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr ""
@@ -5317,7 +5343,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6051,33 +6077,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6639,36 +6665,36 @@ msgid "Name: %s"
msgstr "పేరà±: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr ""
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr ""
@@ -6715,25 +6741,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6741,7 +6767,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7918,43 +7944,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr ""
diff --git a/po/th.po b/po/th.po
index 50a0745f5..33b025eb6 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Thai (http://www.transifex.com/projects/p/manaplus/language/th/)\n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr ""
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr ""
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -496,8 +496,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -524,31 +524,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "ตั้งค่า"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr ""
@@ -561,7 +561,7 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -570,32 +570,32 @@ msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -610,7 +610,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -623,65 +623,65 @@ msgid "Error"
msgstr "ผิดพลาด"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -694,36 +694,36 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr ""
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -732,167 +732,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr ""
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -915,36 +927,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr ""
@@ -981,7 +993,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr ""
@@ -996,7 +1008,7 @@ msgstr ""
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1004,34 +1016,34 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1056,8 +1068,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1077,7 +1089,7 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1090,7 +1102,7 @@ msgstr "ซื้อ"
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1100,8 +1112,8 @@ msgstr ""
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1135,7 +1147,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1158,19 +1170,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1183,44 +1195,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "ยà¸à¹€à¸¥à¸´à¸"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1230,20 +1242,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1252,7 +1264,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1260,69 +1272,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1332,68 +1344,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1402,64 +1414,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1467,42 +1479,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "ใช้"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1511,13 +1523,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1525,134 +1537,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1660,7 +1672,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1670,7 +1682,7 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
@@ -1678,14 +1690,14 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1693,7 +1705,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr "ทิ้ง"
@@ -1701,48 +1713,48 @@ msgstr "ทิ้ง"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2405,7 +2417,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2573,7 +2585,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr ""
@@ -2707,13 +2719,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2793,7 +2805,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3402,12 +3414,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3456,14 +3468,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr ""
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr ""
@@ -3477,7 +3489,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr ""
@@ -3832,17 +3844,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4352,8 +4369,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr ""
@@ -4452,8 +4469,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4485,61 +4502,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4591,93 +4608,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr ""
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr ""
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5233,7 +5259,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr ""
@@ -5316,7 +5342,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6048,33 +6074,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6636,36 +6662,36 @@ msgid "Name: %s"
msgstr "ชื่อ: %s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸Šà¸·à¹ˆà¸­à¸¡à¸•à¹ˆà¸­..."
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr ""
@@ -6712,25 +6738,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6738,7 +6764,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7915,43 +7941,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 3f1066bad..42cb7102d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-01-18 12:47+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
"language/tr/)\n"
@@ -37,25 +37,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:327
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "kaçınıldı"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "miss"
msgstr "ıskalandı"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1933 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1938 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -528,31 +528,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1136 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "Ayarlar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1149 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "Yardım"
@@ -565,7 +565,7 @@ msgstr "Yardım"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1153 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -574,32 +574,32 @@ msgid "Close"
msgstr "Kapat"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1278
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "Bağlanılıyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "Bağlanılıyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1364
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "Oyun dünyasına giriliyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1489
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "Karakterler isteniliyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1529
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "Oyun sunucusuna bağlanılıyor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1542
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "Oyun sunucusu deÄŸiÅŸtiriliyor"
@@ -614,7 +614,7 @@ msgstr "Oyun sunucusu deÄŸiÅŸtiriliyor"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1603 src/client.cpp:1614 src/client.cpp:1798
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -627,65 +627,65 @@ msgid "Error"
msgstr "Hata"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1626
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "Kayıt detayları isteniyor"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1667
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "Åžifre DeÄŸiÅŸtir"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1669
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "Şifreniz başarı ile değiştirildi!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1691
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "E-posta DeÄŸiÅŸtir"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1693
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "E-posta başarı ile değiştirildi!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1716
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "Hesap kapatma başarılı"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1718
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "Hoşçakal, tekrar bekleriz..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1995 src/client.cpp:2010 src/client.cpp:2055
-#: src/client.cpp:2071 src/client.cpp:2520 src/client.cpp:2528
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s yok ve yaratılamıyor! Çıkış yapılıyor."
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2227
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2268 src/client.cpp:2275
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "Hata! Güncelleme klasörü oluşturulamadı!"
-#: src/client.cpp:2297 src/client.cpp:2314
+#: src/client.cpp:2299 src/client.cpp:2316
#, 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."
#. TRANSLATORS: error message question
-#: src/client.cpp:2978
+#: src/client.cpp:3000
msgid "Do you want to open support page?"
msgstr ""
@@ -698,36 +698,36 @@ msgstr "Bilinmeyen komut."
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr "Lütfen bir isim belirtin."
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr "Oyuncu zaten %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr "Oyuncu başarı ile %s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr "Oyuncu %s yapılamaz!"
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "Boş sohbet gönderilemez!"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -738,167 +738,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "Grup adı eksik."
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr "Lonca adı eksik."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "Enter tuşu sohbeti açar/kapatır."
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "Sohbeti kapatır."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "Enter tuşu sohbeti sonlandırır."
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "Mesaj sohbeti kapatır."
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "arkadaÅŸ"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr "ihmal edilmiÅŸ"
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr "nötr"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr "Oyuncu görmezden gelinmiyordu!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr "Oyuncu daha fazla görmezden gelinmiyor!"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr "Oyuncuyu görmezden gelmeme başarılı olmamadı!"
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr "Oyuncu zaten silindi!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr "Oyuncu başarıyla silindi!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr "Oyuncu silinemedi!"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:906 src/commands.cpp:962
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1116
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1342
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1349
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1356
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1380 src/commands.cpp:1389
+#: src/commands.cpp:1476 src/commands.cpp:1485
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1383 src/commands.cpp:1392
+#: src/commands.cpp:1479 src/commands.cpp:1488
msgid "Resource orphaned images:"
msgstr ""
@@ -935,23 +947,23 @@ msgid "Debug"
msgstr "Hata ayıklama"
#. TRANSLATORS: save file message
-#: src/game.cpp:573
+#: src/game.cpp:572
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:583
+#: src/game.cpp:582
msgid "Saving screenshot failed!"
msgstr "Ekran görüntüsü kaydı başarısız!"
#. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
msgid "The connection to the server was lost."
msgstr "Sunucu bağlantısı koptu."
#. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
msgid "Network Error"
msgstr "Ağ Hatası"
@@ -1065,7 +1077,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
-#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1912 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "Taşı"
@@ -1177,7 +1189,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1797
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1259,7 +1271,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1411,7 +1423,7 @@ msgstr "Tamamını takasa ekle"
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "Sakla"
@@ -1476,7 +1488,7 @@ msgstr "Tamamını geri al"
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "Kullan"
@@ -1667,9 +1679,9 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:680
+#: src/gui/windows/inventorywindow.cpp:682
msgid "Unequip"
msgstr "Çıkar"
@@ -1678,7 +1690,7 @@ msgstr "Çıkar"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "Donatmak"
@@ -1686,7 +1698,7 @@ msgstr "Donatmak"
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:788
+#: src/gui/windows/inventorywindow.cpp:790
msgid "Drop..."
msgstr "Bırak..."
@@ -1701,7 +1713,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:793
+#: src/gui/windows/inventorywindow.cpp:795
msgid "Drop"
msgstr "Bırak"
@@ -1790,8 +1802,8 @@ msgstr "Navigasyon noktasına git"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "Saldırmayı durdur"
+msgid "Stop Attack / Modifier key"
+msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:105
@@ -2306,100 +2318,95 @@ msgstr "Kamera moduna geç"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr ""
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
msgid "Show onscreen keyboard"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
msgid "Move Keys"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
msgid "Move Up"
msgstr "Yukarı Taşı"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
msgid "Move Down"
msgstr "Aşağı Taşı"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
msgid "Move Left"
msgstr "Sola Taşı"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
msgid "Move Right"
msgstr "Sağa Taşı"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
msgid "Move Forward"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
msgid "Move to navigation point shortcuts"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1440
-#: src/gui/setupactiondata.h:1446 src/gui/setupactiondata.h:1452
-#: src/gui/setupactiondata.h:1458 src/gui/setupactiondata.h:1464
-#: src/gui/setupactiondata.h:1470 src/gui/setupactiondata.h:1476
-#: src/gui/setupactiondata.h:1482 src/gui/setupactiondata.h:1488
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: src/gui/setupactiondata.h:1686 src/gui/setupactiondata.h:1692
-#: src/gui/setupactiondata.h:1698 src/gui/setupactiondata.h:1704
-#: src/gui/setupactiondata.h:1710 src/gui/setupactiondata.h:1716
+#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1434
+#: src/gui/setupactiondata.h:1440 src/gui/setupactiondata.h:1446
+#: src/gui/setupactiondata.h:1452 src/gui/setupactiondata.h:1458
+#: src/gui/setupactiondata.h:1464 src/gui/setupactiondata.h:1470
+#: src/gui/setupactiondata.h:1476 src/gui/setupactiondata.h:1482
+#: src/gui/setupactiondata.h:1488 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 src/gui/setupactiondata.h:1686
+#: src/gui/setupactiondata.h:1692 src/gui/setupactiondata.h:1698
+#: src/gui/setupactiondata.h:1704 src/gui/setupactiondata.h:1710
#, c-format
msgid "Move to point Shortcut %d"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
msgid "Move & selection"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
msgid "Move Home"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
msgid "Move End"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
msgid "Page up"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
msgid "Page down"
msgstr ""
@@ -2408,23 +2415,23 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1785 src/gui/setupactiondata.h:1930
+#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
msgid "Select"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
msgid "Select2"
msgstr ""
@@ -2434,7 +2441,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1809 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
#: src/gui/windows/charselectdialog.cpp:106
#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
#: src/gui/windows/shopwindow.cpp:100
@@ -2443,45 +2450,45 @@ msgid "Delete"
msgstr "Sil"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
msgid "Backspace"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
msgid "Insert"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
msgid "Tab"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
msgid "Mod"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
msgid "Ctrl"
msgstr ""
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
msgid "Basic"
msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1920 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
msgid "Shortcuts"
msgstr "Kısayollar"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
#: src/gui/windowmenu.cpp:161
msgid "Windows"
msgstr ""
@@ -2489,7 +2496,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: emotes window name
#. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1924 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
#: src/gui/windows/emotewindow.cpp:107
msgid "Emotes"
msgstr ""
@@ -2497,13 +2504,13 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1928 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
msgid "Chat"
msgstr "Sohbet"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
msgid "Gui"
msgstr ""
@@ -2580,7 +2587,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "Partikül efektleri"
@@ -2714,14 +2721,14 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
-#: src/gui/windows/inventorywindow.cpp:598
+#: src/gui/widgets/characterdisplay.cpp:136
+#: src/gui/windows/inventorywindow.cpp:600
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2800,7 +2807,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:339 src/gui/widgets/setupitem.cpp:475
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr "Dünzenle"
@@ -3468,14 +3475,14 @@ msgstr "varsayılan"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "düşük"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "orta"
@@ -3489,7 +3496,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "yüksek"
@@ -3845,9 +3852,8 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:376
-#, fuzzy
msgid "Screenshot directory"
-msgstr "Ekran Görüntüsü"
+msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:381
@@ -4370,8 +4376,8 @@ msgstr "Tema DeÄŸiÅŸtirildi"
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:499
+#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "Değişikliklerin etkinleşmesi için istemcinizi tekrar başlatın."
@@ -4458,106 +4464,106 @@ msgid "Button %u action"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:190
msgid "Full screen"
msgstr "Tam ekran"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
msgid "FPS limit:"
msgstr "FPS limiti:"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:194
-#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:198
+#: src/gui/widgets/tabs/setup_video.cpp:240
+#: src/gui/widgets/tabs/setup_video.cpp:429
+#: src/gui/widgets/tabs/setup_video.cpp:557
msgid "Alt FPS limit: "
msgstr "Alternatif FPS limiti:"
#. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:197
+#: src/gui/widgets/tabs/setup_video.cpp:201
msgid "Detect best mode"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:210
msgid "Show cursor"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:213
msgid "Custom cursor"
msgstr "Özel imleç"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:217
msgid "Enable resize"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:220
msgid "No frame"
msgstr ""
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:241
+#: src/gui/widgets/tabs/setup_video.cpp:427
+#: src/gui/widgets/tabs/setup_video.cpp:541
+#: src/gui/widgets/tabs/setup_video.cpp:554
msgid "None"
msgstr "Hiç"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:349
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr "Pencere görünümüne geçilemedi ve eski hale geri dönüş başarısız oldu!"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:356
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr "Tam ekrana geçilemedi ve eski hale geri dönüş başarısız oldu!"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:368
msgid "Switching to Full Screen"
msgstr "Tam Ekrana Geçiliyor"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:370
msgid "Restart needed for changes to take effect."
msgstr "Değişikliklerin etkili olması için yeniden başlatma gerekli."
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:388
msgid "Changing to OpenGL"
msgstr "OpenGL'ye DeÄŸiÅŸtiriliyor"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:390
msgid "Applying change to OpenGL requires restart."
msgstr "OpenGL değişikliklerini uygulamak için yeniden başlatma gereklidir."
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:468
msgid "Custom resolution (example: 1024x768)"
msgstr "Özel çözünürlük (örnek: 1024x768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:470
msgid "Enter new resolution: "
msgstr "Yeni çözünürlük gir:"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:497
+#: src/gui/widgets/tabs/setup_video.cpp:506
msgid "Screen Resolution Changed"
msgstr "Ekran Çözünürlüğü Değiştirildi"
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:500
msgid "Some windows may be moved to fit the lowered resolution."
msgstr "Bazı pencereler düşürülmüş çözünürlüğe uyması için taşınmış olabilir."
@@ -4609,93 +4615,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr "Bildirimleri"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr "Toplama bildirimlerini sohbette göster"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr "Toplama bildirimlerini partikül efekti olarak göster"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Gui şeffaflığı"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "Başın üstünde yazı"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "Çevresel grafikler"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "en yüksek"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr "Partikül detayı"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -4814,7 +4829,7 @@ msgstr "EKP"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
#: src/gui/windows/inventorywindow.cpp:228
msgid "Equipment"
msgstr "Ekipman"
@@ -5335,7 +5350,7 @@ msgid "Whispering to %s: %s"
msgstr "%s 'e fısıldanıyor: %s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1607
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6090,12 +6105,12 @@ msgid "Error retreiving server list!"
msgstr "Sunucu listesi alma hatası!"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:638
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr "daha yeni bir sürüm gerektirir"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:643
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr "v%s gerektirir"
@@ -7983,3 +7998,6 @@ msgstr "Bilinmeyen nesne"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
+
+#~ msgid "Stop Attack"
+#~ msgstr "Saldırmayı durdur"
diff --git a/po/vls.po b/po/vls.po
index e8a75b7e0..e7b59af1f 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+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"
@@ -18,12 +18,12 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr ""
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr ""
@@ -33,25 +33,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -496,8 +496,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -524,31 +524,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr ""
@@ -561,7 +561,7 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -570,32 +570,32 @@ msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -610,7 +610,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -623,65 +623,65 @@ msgid "Error"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -694,36 +694,36 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr ""
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -732,167 +732,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr ""
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -915,36 +927,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr ""
@@ -981,7 +993,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr ""
@@ -996,7 +1008,7 @@ msgstr ""
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1004,34 +1016,34 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1056,8 +1068,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1077,7 +1089,7 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1090,7 +1102,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1100,8 +1112,8 @@ msgstr ""
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1135,7 +1147,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1158,19 +1170,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1183,44 +1195,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1230,20 +1242,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1252,7 +1264,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1260,69 +1272,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1332,68 +1344,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1402,64 +1414,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1467,42 +1479,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1511,13 +1523,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1525,134 +1537,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1660,7 +1672,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1670,7 +1682,7 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr ""
@@ -1678,14 +1690,14 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1693,7 +1705,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr ""
@@ -1701,48 +1713,48 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2405,7 +2417,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2573,7 +2585,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr ""
@@ -2707,13 +2719,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2793,7 +2805,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3402,12 +3414,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3456,14 +3468,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr ""
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr ""
@@ -3477,7 +3489,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr ""
@@ -3832,17 +3844,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4352,8 +4369,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr ""
@@ -4452,8 +4469,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4485,61 +4502,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4591,93 +4608,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr ""
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr ""
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5233,7 +5259,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr ""
@@ -5316,7 +5342,7 @@ msgid "Whispering to %s: %s"
msgstr ""
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6050,33 +6076,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6638,36 +6664,36 @@ msgid "Name: %s"
msgstr ""
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr ""
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr ""
@@ -6714,25 +6740,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6740,7 +6766,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7917,43 +7943,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index facfe25a4..e0332a7f3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-01-18 12:47+0300\n"
-"PO-Revision-Date: 2014-01-13 15:23+0000\n"
-"Last-Translator: yudun1989 <yudun1989@gmail.com>\n"
+"POT-Creation-Date: 2014-02-01 12:07+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+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"
"Language: zh_CN\n"
@@ -39,25 +39,25 @@ msgid "Visible on map"
msgstr "在地图上å¯è§"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:327
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "dodge"
msgstr "躲闪"
-#: src/being/being.cpp:541
+#: src/being/being.cpp:543
msgid "miss"
msgstr "失误"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1933 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1938 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr "I"
@@ -529,31 +529,31 @@ msgstr "æµåŠ¨çš„泡沫"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1136 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "设置"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1140 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1143 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:225
msgid "Video"
msgstr "视频"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1146 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr "主题"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1149 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "帮助"
@@ -566,7 +566,7 @@ msgstr "帮助"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1153 src/gui/popups/popupmenu.cpp:617
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -575,32 +575,32 @@ msgid "Close"
msgstr "关闭"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1278
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr "正在连接æœåŠ¡å™¨"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1324
msgid "Logging in"
msgstr "登录中"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1364
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr "进入游æˆä¸–ç•Œ"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1489
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr "请求角色"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1529
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr "正在连接游æˆæœåŠ¡å™¨"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1542
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr "正在更改游æˆæœåŠ¡å™¨"
@@ -615,7 +615,7 @@ msgstr "正在更改游æˆæœåŠ¡å™¨"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1603 src/client.cpp:1614 src/client.cpp:1798
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -628,65 +628,65 @@ msgid "Error"
msgstr "错误"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1626
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr "正在请求详细注册信æ¯"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1667
+#: src/client.cpp:1669
msgid "Password Change"
msgstr "更改密ç "
#. TRANSLATORS: password change message text
-#: src/client.cpp:1669
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr "密ç æ›´æ”¹æˆåŠŸï¼"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1691
+#: src/client.cpp:1693
msgid "Email Change"
msgstr "更改电å­é‚®ç®±åœ°å€"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1693
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr "电å­é‚®ç®±åœ°å€æ›´æ”¹æˆåŠŸï¼"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1716
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr "å–消注册æˆåŠŸ"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1718
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr "å†è§ï¼Œæ¬¢è¿Žéšæ—¶å›žæ¥... ..."
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1995 src/client.cpp:2010 src/client.cpp:2055
-#: src/client.cpp:2071 src/client.cpp:2520 src/client.cpp:2528
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2524 src/client.cpp:2532
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s ä¸å­˜åœ¨ï¼Œä¸”无法创建ï¼æ­£åœ¨é€€å‡ºã€‚"
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2227
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2268 src/client.cpp:2275
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "创建更新目录错误ï¼"
-#: src/client.cpp:2297 src/client.cpp:2314
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "错误:%s ä¸å­˜åœ¨ä¸”无法创建ï¼æ­£åœ¨é€€å‡ºã€‚"
#. TRANSLATORS: error message question
-#: src/client.cpp:2978
+#: src/client.cpp:3000
msgid "Do you want to open support page?"
msgstr ""
@@ -699,36 +699,36 @@ msgstr "未知命令。"
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr "请指定一个å称。"
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr "玩家已ç»%s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr "玩家æˆåŠŸ%s!"
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr "玩家ä¸èƒ½ä¸º %s"
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "无法å‘é€ç©ºç™½ç§ä¿¡ï¼"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -737,167 +737,179 @@ msgstr "无法为 \"%s\"创建ç§ä¿¡æ ‡ç­¾ï¼è¦ä¹ˆå·²ç»å­˜åœ¨ï¼Œè¦ä¹ˆæ˜¯ä½ è‡
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "帮会å称缺失。"
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr "公会å称缺失。"
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "<回车>键促å‘èŠå¤©ã€‚"
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "讯æ¯å…³é—­èŠå¤©ã€‚"
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "<回车>键现在促å‘èŠå¤©ã€‚"
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "讯æ¯çŽ°åœ¨å…³é—­èŠå¤©ã€‚"
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr "朋å‹"
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr "无视"
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr "中立"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr "玩家没有被忽视ï¼"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr "玩家ä¸å†è¢«å¿½è§†ï¼"
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr "ä¸èƒ½å–消对玩家的忽视!"
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr "玩家已ç»è¢«åˆ é™¤!"
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr "玩家æˆåŠŸè¢«åˆ é™¤ï¼"
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr "无法删除玩家ï¼"
#. TRANSLATORS: uptime command
-#: src/commands.cpp:906 src/commands.cpp:962
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:917
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:928
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:938
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:948
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:958
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1116
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1342
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1349
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1356
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1380 src/commands.cpp:1389
+#: src/commands.cpp:1476 src/commands.cpp:1485
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1383 src/commands.cpp:1392
+#: src/commands.cpp:1479 src/commands.cpp:1488
msgid "Resource orphaned images:"
msgstr ""
@@ -933,23 +945,23 @@ msgid "Debug"
msgstr "调试 "
#. TRANSLATORS: save file message
-#: src/game.cpp:573
+#: src/game.cpp:572
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:583
+#: src/game.cpp:582
msgid "Saving screenshot failed!"
msgstr "ä¿å­˜å±å¹•å¿«ç…§å¤±è´¥ï¼"
#. TRANSLATORS: error message text
-#: src/game.cpp:654
+#: src/game.cpp:653
msgid "The connection to the server was lost."
msgstr "æœåŠ¡å™¨çš„连接丢失。"
#. TRANSLATORS: error message header
-#: src/game.cpp:657
+#: src/game.cpp:656
msgid "Network Error"
msgstr "网络错误"
@@ -1063,7 +1075,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
-#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
+#: src/gui/setupactiondata.h:1912 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr "移动"
@@ -1175,7 +1187,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
-#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1797
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1257,7 +1269,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1920
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1409,7 +1421,7 @@ msgstr ""
#. TRANSLATORS: setup button
#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
+#: src/gui/windows/inventorywindow.cpp:782 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "存储"
@@ -1474,7 +1486,7 @@ msgstr "检索所有"
#. TRANSLATORS: skills dialog button
#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
-#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
+#: src/gui/windows/inventorywindow.cpp:693 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "使用"
@@ -1665,9 +1677,9 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:66
#: src/gui/windows/inventorywindow.cpp:207
-#: src/gui/windows/inventorywindow.cpp:680
+#: src/gui/windows/inventorywindow.cpp:682
msgid "Unequip"
msgstr "å¸ä¸‹è£…备"
@@ -1676,7 +1688,7 @@ msgstr "å¸ä¸‹è£…备"
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
-#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
+#: src/gui/windows/inventorywindow.cpp:687 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "装备"
@@ -1684,7 +1696,7 @@ msgstr "装备"
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
-#: src/gui/windows/inventorywindow.cpp:788
+#: src/gui/windows/inventorywindow.cpp:790
msgid "Drop..."
msgstr "掉è½... ..."
@@ -1699,7 +1711,7 @@ msgstr "所有"
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
-#: src/gui/windows/inventorywindow.cpp:793
+#: src/gui/windows/inventorywindow.cpp:795
msgid "Drop"
msgstr "丢弃"
@@ -1788,8 +1800,9 @@ msgstr "移动导航点"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:99
-msgid "Stop Attack"
-msgstr "åœæ­¢æ”»å‡»"
+#, fuzzy
+msgid "Stop Attack / Modifier key"
+msgstr "修改按键"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:105
@@ -2304,100 +2317,95 @@ msgstr "切æ¢æ¨¡å¼"
#. TRANSLATORS: input action name
#: src/gui/setupactiondata.h:1371
-msgid "Modifier key"
-msgstr "修改按键"
-
-#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1377
msgid "Show onscreen keyboard"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1392
+#: src/gui/setupactiondata.h:1386
msgid "Move Keys"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
+#: src/gui/setupactiondata.h:1392 src/gui/setupactiondata.h:1731
msgid "Move Up"
msgstr "å‘上移动"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
+#: src/gui/setupactiondata.h:1398 src/gui/setupactiondata.h:1737
msgid "Move Down"
msgstr "å‘下移动"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
+#: src/gui/setupactiondata.h:1404 src/gui/setupactiondata.h:1743
msgid "Move Left"
msgstr "å‘左移动"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1416 src/gui/setupactiondata.h:1755
+#: src/gui/setupactiondata.h:1410 src/gui/setupactiondata.h:1749
msgid "Move Right"
msgstr "å‘å³ç§»åŠ¨"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1422
+#: src/gui/setupactiondata.h:1416
msgid "Move Forward"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1428
+#: src/gui/setupactiondata.h:1422
msgid "Move to navigation point shortcuts"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1434 src/gui/setupactiondata.h:1440
-#: src/gui/setupactiondata.h:1446 src/gui/setupactiondata.h:1452
-#: src/gui/setupactiondata.h:1458 src/gui/setupactiondata.h:1464
-#: src/gui/setupactiondata.h:1470 src/gui/setupactiondata.h:1476
-#: src/gui/setupactiondata.h:1482 src/gui/setupactiondata.h:1488
-#: src/gui/setupactiondata.h:1494 src/gui/setupactiondata.h:1500
-#: src/gui/setupactiondata.h:1506 src/gui/setupactiondata.h:1512
-#: src/gui/setupactiondata.h:1518 src/gui/setupactiondata.h:1524
-#: src/gui/setupactiondata.h:1530 src/gui/setupactiondata.h:1536
-#: src/gui/setupactiondata.h:1542 src/gui/setupactiondata.h:1548
-#: src/gui/setupactiondata.h:1554 src/gui/setupactiondata.h:1560
-#: src/gui/setupactiondata.h:1566 src/gui/setupactiondata.h:1572
-#: src/gui/setupactiondata.h:1578 src/gui/setupactiondata.h:1584
-#: src/gui/setupactiondata.h:1590 src/gui/setupactiondata.h:1596
-#: src/gui/setupactiondata.h:1602 src/gui/setupactiondata.h:1608
-#: src/gui/setupactiondata.h:1614 src/gui/setupactiondata.h:1620
-#: src/gui/setupactiondata.h:1626 src/gui/setupactiondata.h:1632
-#: src/gui/setupactiondata.h:1638 src/gui/setupactiondata.h:1644
-#: src/gui/setupactiondata.h:1650 src/gui/setupactiondata.h:1656
-#: src/gui/setupactiondata.h:1662 src/gui/setupactiondata.h:1668
-#: src/gui/setupactiondata.h:1674 src/gui/setupactiondata.h:1680
-#: src/gui/setupactiondata.h:1686 src/gui/setupactiondata.h:1692
-#: src/gui/setupactiondata.h:1698 src/gui/setupactiondata.h:1704
-#: src/gui/setupactiondata.h:1710 src/gui/setupactiondata.h:1716
+#: src/gui/setupactiondata.h:1428 src/gui/setupactiondata.h:1434
+#: src/gui/setupactiondata.h:1440 src/gui/setupactiondata.h:1446
+#: src/gui/setupactiondata.h:1452 src/gui/setupactiondata.h:1458
+#: src/gui/setupactiondata.h:1464 src/gui/setupactiondata.h:1470
+#: src/gui/setupactiondata.h:1476 src/gui/setupactiondata.h:1482
+#: src/gui/setupactiondata.h:1488 src/gui/setupactiondata.h:1494
+#: src/gui/setupactiondata.h:1500 src/gui/setupactiondata.h:1506
+#: src/gui/setupactiondata.h:1512 src/gui/setupactiondata.h:1518
+#: src/gui/setupactiondata.h:1524 src/gui/setupactiondata.h:1530
+#: src/gui/setupactiondata.h:1536 src/gui/setupactiondata.h:1542
+#: src/gui/setupactiondata.h:1548 src/gui/setupactiondata.h:1554
+#: src/gui/setupactiondata.h:1560 src/gui/setupactiondata.h:1566
+#: src/gui/setupactiondata.h:1572 src/gui/setupactiondata.h:1578
+#: src/gui/setupactiondata.h:1584 src/gui/setupactiondata.h:1590
+#: src/gui/setupactiondata.h:1596 src/gui/setupactiondata.h:1602
+#: src/gui/setupactiondata.h:1608 src/gui/setupactiondata.h:1614
+#: src/gui/setupactiondata.h:1620 src/gui/setupactiondata.h:1626
+#: src/gui/setupactiondata.h:1632 src/gui/setupactiondata.h:1638
+#: src/gui/setupactiondata.h:1644 src/gui/setupactiondata.h:1650
+#: src/gui/setupactiondata.h:1656 src/gui/setupactiondata.h:1662
+#: src/gui/setupactiondata.h:1668 src/gui/setupactiondata.h:1674
+#: src/gui/setupactiondata.h:1680 src/gui/setupactiondata.h:1686
+#: src/gui/setupactiondata.h:1692 src/gui/setupactiondata.h:1698
+#: src/gui/setupactiondata.h:1704 src/gui/setupactiondata.h:1710
#, c-format
msgid "Move to point Shortcut %d"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1731
+#: src/gui/setupactiondata.h:1725
msgid "Move & selection"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1761
+#: src/gui/setupactiondata.h:1755
msgid "Move Home"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1767
+#: src/gui/setupactiondata.h:1761
msgid "Move End"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1773
+#: src/gui/setupactiondata.h:1767
msgid "Page up"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1779
+#: src/gui/setupactiondata.h:1773
msgid "Page down"
msgstr ""
@@ -2406,23 +2414,23 @@ msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: char create dialog button
#. TRANSLATORS: register dialog. button.
-#: src/gui/setupactiondata.h:1785 src/gui/setupactiondata.h:1930
+#: src/gui/setupactiondata.h:1779 src/gui/setupactiondata.h:1924
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
msgstr "其他"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1791
+#: src/gui/setupactiondata.h:1785
msgid "Select"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1797
+#: src/gui/setupactiondata.h:1791
msgid "Select2"
msgstr ""
@@ -2432,7 +2440,7 @@ msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
#. TRANSLATORS: command editor button
-#: src/gui/setupactiondata.h:1809 src/gui/widgets/tabs/setup_relations.cpp:259
+#: src/gui/setupactiondata.h:1803 src/gui/widgets/tabs/setup_relations.cpp:259
#: src/gui/windows/charselectdialog.cpp:106
#: src/gui/windows/serverdialog.cpp:262 src/gui/windows/shopwindow.cpp:93
#: src/gui/windows/shopwindow.cpp:100
@@ -2441,45 +2449,45 @@ msgid "Delete"
msgstr "删除"
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1815
+#: src/gui/setupactiondata.h:1809
msgid "Backspace"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1821
+#: src/gui/setupactiondata.h:1815
msgid "Insert"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1827
+#: src/gui/setupactiondata.h:1821
msgid "Tab"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1833
+#: src/gui/setupactiondata.h:1827
msgid "Mod"
msgstr ""
#. TRANSLATORS: input action name
-#: src/gui/setupactiondata.h:1839
+#: src/gui/setupactiondata.h:1833
msgid "Ctrl"
msgstr ""
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1916
+#: src/gui/setupactiondata.h:1910
msgid "Basic"
msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1920 src/gui/windowmenu.cpp:128
+#: src/gui/setupactiondata.h:1914 src/gui/windowmenu.cpp:128
msgid "Shortcuts"
msgstr "å¿«æ·é”®"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/setupactiondata.h:1916 src/gui/widgets/tabs/setup_other.cpp:307
#: src/gui/windowmenu.cpp:161
msgid "Windows"
msgstr ""
@@ -2487,7 +2495,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: emotes window name
#. TRANSLATORS: emotes tab name
-#: src/gui/setupactiondata.h:1924 src/gui/windows/emotewindow.cpp:49
+#: src/gui/setupactiondata.h:1918 src/gui/windows/emotewindow.cpp:49
#: src/gui/windows/emotewindow.cpp:107
msgid "Emotes"
msgstr ""
@@ -2495,13 +2503,13 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings tab name
#. TRANSLATORS: chat window name
-#: src/gui/setupactiondata.h:1928 src/gui/widgets/tabs/setup_chat.cpp:41
+#: src/gui/setupactiondata.h:1922 src/gui/widgets/tabs/setup_chat.cpp:41
#: src/gui/windowmenu.cpp:86 src/gui/windows/chatwindow.cpp:203
msgid "Chat"
msgstr "èŠå¤©"
#. TRANSLATORS: input tab sub tab name
-#: src/gui/setupactiondata.h:1932
+#: src/gui/setupactiondata.h:1926
msgid "Gui"
msgstr ""
@@ -2578,7 +2586,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "ç²’å­æ•ˆæžœ"
@@ -2712,14 +2720,14 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
-#: src/gui/windows/inventorywindow.cpp:598
+#: src/gui/widgets/characterdisplay.cpp:136
+#: src/gui/windows/inventorywindow.cpp:600
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
#, c-format
@@ -2798,7 +2806,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:339 src/gui/widgets/setupitem.cpp:475
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr "编辑"
@@ -3461,14 +3469,14 @@ msgstr "默认"
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "低"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "中"
@@ -3482,7 +3490,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "高"
@@ -3838,9 +3846,8 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:376
-#, fuzzy
msgid "Screenshot directory"
-msgstr "å±å¹•å¿«ç…§"
+msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:381
@@ -4363,8 +4370,8 @@ msgstr "主题更改"
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:499
+#: src/gui/widgets/tabs/setup_video.cpp:508
msgid "Restart your client for the change to take effect."
msgstr "é‡å¯æ‚¨çš„游æˆå®¢æˆ·ç«¯ä»¥ä½¿å˜æ›´ç”Ÿæ•ˆã€‚"
@@ -4451,106 +4458,106 @@ msgid "Button %u action"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:186
+#: src/gui/widgets/tabs/setup_video.cpp:190
msgid "Full screen"
msgstr "å…¨å±"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:189
+#: src/gui/widgets/tabs/setup_video.cpp:193
msgid "FPS limit:"
msgstr "FPSé™åˆ¶ï¼š"
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:194
-#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:198
+#: src/gui/widgets/tabs/setup_video.cpp:240
+#: src/gui/widgets/tabs/setup_video.cpp:429
+#: src/gui/widgets/tabs/setup_video.cpp:557
msgid "Alt FPS limit: "
msgstr ""
#. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:197
+#: src/gui/widgets/tabs/setup_video.cpp:201
msgid "Detect best mode"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:206
+#: src/gui/widgets/tabs/setup_video.cpp:210
msgid "Show cursor"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:209
+#: src/gui/widgets/tabs/setup_video.cpp:213
msgid "Custom cursor"
msgstr "自定义鼠标"
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:213
+#: src/gui/widgets/tabs/setup_video.cpp:217
msgid "Enable resize"
msgstr ""
#. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:216
+#: src/gui/widgets/tabs/setup_video.cpp:220
msgid "No frame"
msgstr ""
#. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:241
+#: src/gui/widgets/tabs/setup_video.cpp:427
+#: src/gui/widgets/tabs/setup_video.cpp:541
+#: src/gui/widgets/tabs/setup_video.cpp:554
msgid "None"
msgstr "w"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:349
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr "切æ¢åˆ°çª—å£æ¨¡å¼ï¼Œå¹¶æ¢å¤æ—§çš„模å¼ï¼Œä¹Ÿæ²¡æœ‰å¤±è´¥ï¼"
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:356
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:368
msgid "Switching to Full Screen"
msgstr "切æ¢åˆ°å…¨å±"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:370
msgid "Restart needed for changes to take effect."
msgstr "é‡å¯ç”Ÿæ•ˆ"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:388
msgid "Changing to OpenGL"
msgstr "切æ¢åˆ°OpenGL"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:390
msgid "Applying change to OpenGL requires restart."
msgstr "è¿ç”¨æ”¹å˜ä¸ºOpenGL需è¦é‡æ–°å¼€å§‹"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:468
msgid "Custom resolution (example: 1024x768)"
msgstr "自定义分辨率 (例如: 1024x768)"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:470
msgid "Enter new resolution: "
msgstr "输入新的分辨率:"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:497
+#: src/gui/widgets/tabs/setup_video.cpp:506
msgid "Screen Resolution Changed"
msgstr "å±å¹•åˆ†è¾¨çŽ‡å·²æ›´æ”¹"
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:500
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4602,93 +4609,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Gui é€æ˜Žåº¦"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "头顶文字"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "环境音效"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "最大"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr "l"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -4805,7 +4821,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:61
+#: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:59
#: src/gui/windows/inventorywindow.cpp:228
msgid "Equipment"
msgstr "装备"
@@ -5326,7 +5342,7 @@ msgid "Whispering to %s: %s"
msgstr "对%s密语到:%s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1607
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6079,12 +6095,12 @@ msgid "Error retreiving server list!"
msgstr "æ¢å¤æœåŠ¡å™¨åˆ—表错误ï¼"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:638
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr "需è¦è¾ƒæ–°ç‰ˆæœ¬"
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:643
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr "éœ€è¦ v%s"
@@ -7973,3 +7989,6 @@ msgstr "未知物å“"
#: src/resources/db/petdb.cpp:99
msgid "pet"
msgstr ""
+
+#~ msgid "Stop Attack"
+#~ msgstr "åœæ­¢æ”»å‡»"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 68bf7763f..8dc32082f 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/manaplus/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr ""
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr ""
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -496,8 +496,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -524,31 +524,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "設定"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr "顯示"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "說明"
@@ -561,7 +561,7 @@ msgstr "說明"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -570,32 +570,32 @@ msgid "Close"
msgstr "關閉"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -610,7 +610,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -623,65 +623,65 @@ msgid "Error"
msgstr "錯誤"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -694,36 +694,36 @@ msgstr "ä¸æ˜ŽæŒ‡ä»¤"
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr ""
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -732,167 +732,179 @@ msgstr ""
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr ""
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr ""
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -915,36 +927,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr ""
@@ -981,7 +993,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr "交易"
@@ -996,7 +1008,7 @@ msgstr "交易"
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1004,34 +1016,34 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1056,8 +1068,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1077,7 +1089,7 @@ msgstr ""
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1090,7 +1102,7 @@ msgstr "購買"
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1100,8 +1112,8 @@ msgstr "出售"
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1135,7 +1147,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1158,19 +1170,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1183,44 +1195,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "å–消"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr "玩家"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1230,20 +1242,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1252,7 +1264,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1260,69 +1272,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1332,68 +1344,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1402,64 +1414,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1467,42 +1479,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "使用"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1511,13 +1523,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1525,134 +1537,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1660,7 +1672,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1670,7 +1682,7 @@ msgstr "å¸ä¸‹è£å‚™"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "è£å‚™"
@@ -1678,14 +1690,14 @@ msgstr "è£å‚™"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1693,7 +1705,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr "丟棄"
@@ -1701,48 +1713,48 @@ msgstr "丟棄"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr "分開"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2405,7 +2417,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2573,7 +2585,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr ""
@@ -2707,13 +2719,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2793,7 +2805,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3402,12 +3414,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3456,14 +3468,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "低"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "中"
@@ -3477,7 +3489,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "高"
@@ -3832,17 +3844,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4352,8 +4369,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr ""
@@ -4452,8 +4469,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4485,61 +4502,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr "è«‹é‡æ–°å•Ÿå‹•"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr "確èªåˆ‡æ›OpenGL需è¦é‡æ–°é–‹å§‹"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4591,93 +4608,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Gui é€æ˜Žåº¦"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr ""
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "最大"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5233,7 +5259,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr "開始"
@@ -5316,7 +5342,7 @@ msgid "Whispering to %s: %s"
msgstr "å°%sç«Šç«Šç§èªžï¼š%s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6048,33 +6074,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6636,36 +6662,36 @@ msgid "Name: %s"
msgstr "å字:%s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr "更新中..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr "連線中..."
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr "已完æˆ"
@@ -6712,25 +6738,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6738,7 +6764,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7915,43 +7941,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 760f9cb1c..1fd1a06fa 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: 2014-01-10 12:12+0300\n"
-"PO-Revision-Date: 2014-01-11 08:14+0000\n"
+"POT-Creation-Date: 2014-01-30 11:24+0300\n"
+"PO-Revision-Date: 2014-01-31 08:14+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/manaplus/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -19,12 +19,12 @@ msgstr ""
"Plural-Forms: nplurals=1; plural=0;\n"
#. TRANSLATORS: disable trades message
-#: src/actionmanager.cpp:864
+#: src/actionmanager.cpp:872
msgid "Ignoring incoming trade requests"
msgstr "忽略收到的交易è¦æ±‚"
#. TRANSLATORS: enable trades message
-#: src/actionmanager.cpp:874
+#: src/actionmanager.cpp:882
msgid "Accepting incoming trade requests"
msgstr "接å—收到的交易è¦æ±‚"
@@ -34,25 +34,25 @@ msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:323
+#: src/being/being.cpp:329
msgid "Human"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:537
+#: src/being/being.cpp:543
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1923 src/gui/windows/whoisonline.cpp:863
+#: src/being/being.cpp:1966 src/gui/windows/whoisonline.cpp:863
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1928 src/gui/windows/whoisonline.cpp:868
+#: src/being/being.cpp:1971 src/gui/windows/whoisonline.cpp:868
msgid "I"
msgstr ""
@@ -496,8 +496,8 @@ msgstr ""
#. TRANSLATORS: add player to completle ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2525
-#: src/gui/popups/popupmenu.cpp:2567
+#: src/being/playerrelations.cpp:466 src/gui/popups/popupmenu.cpp:2524
+#: src/gui/popups/popupmenu.cpp:2566
msgid "Completely ignore"
msgstr ""
@@ -524,31 +524,31 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:1131 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
+#: src/client.cpp:1138 src/gui/windowmenu.cpp:165 src/gui/windows/setup.cpp:59
msgid "Setup"
msgstr "設定"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:1135 src/gui/widgets/tabs/setup_perfomance.cpp:50
+#: src/client.cpp:1142 src/gui/widgets/tabs/setup_perfomance.cpp:50
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:1138 src/gui/widgets/tabs/setup_video.cpp:221
+#: src/client.cpp:1145 src/gui/widgets/tabs/setup_video.cpp:221
msgid "Video"
msgstr "顯示"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:1141 src/gui/widgets/tabs/setup_theme.cpp:289
+#: src/client.cpp:1148 src/gui/widgets/tabs/setup_theme.cpp:289
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:1144 src/gui/windowmenu.cpp:72
+#: src/client.cpp:1151 src/gui/windowmenu.cpp:72
#: src/gui/windows/helpwindow.cpp:50
msgid "Help"
msgstr "說明"
@@ -561,7 +561,7 @@ msgstr "說明"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:1148 src/gui/popups/popupmenu.cpp:618
+#: src/client.cpp:1155 src/gui/popups/popupmenu.cpp:617
#: src/gui/windows/didyouknowwindow.cpp:78
#: src/gui/windows/inventorywindow.cpp:258 src/gui/windows/npcdialog.cpp:71
#: src/gui/windows/npcdialog.cpp:109 src/gui/windows/questswindow.cpp:136
@@ -570,32 +570,32 @@ msgid "Close"
msgstr "關閉"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1280
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1317
+#: src/client.cpp:1324
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1359
+#: src/client.cpp:1366
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1484
+#: src/client.cpp:1491
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1524
+#: src/client.cpp:1531
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1537
+#: src/client.cpp:1544
msgid "Changing game servers"
msgstr ""
@@ -610,7 +610,7 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1598 src/client.cpp:1609 src/client.cpp:1793
+#: src/client.cpp:1605 src/client.cpp:1616 src/client.cpp:1800
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:358
@@ -623,65 +623,65 @@ msgid "Error"
msgstr "錯誤"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1621
+#: src/client.cpp:1628
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1662
+#: src/client.cpp:1669
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1664
+#: src/client.cpp:1671
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1686
+#: src/client.cpp:1693
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1688
+#: src/client.cpp:1695
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1711
+#: src/client.cpp:1718
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1713
+#: src/client.cpp:1720
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
-#: src/client.cpp:1990 src/client.cpp:2005 src/client.cpp:2050
-#: src/client.cpp:2066 src/client.cpp:2516 src/client.cpp:2524
+#: src/client.cpp:1997 src/client.cpp:2012 src/client.cpp:2057
+#: src/client.cpp:2073 src/client.cpp:2522 src/client.cpp:2530
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2222
+#: src/client.cpp:2229
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/client.cpp:2263 src/client.cpp:2270
+#: src/client.cpp:2270 src/client.cpp:2277
msgid "Error creating updates directory!"
msgstr "建立更新目錄失敗ï¼"
-#: src/client.cpp:2292 src/client.cpp:2305
+#: src/client.cpp:2299 src/client.cpp:2316
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: error message question
-#: src/client.cpp:2974
+#: src/client.cpp:2998
msgid "Do you want to open support page?"
msgstr ""
@@ -694,36 +694,36 @@ msgstr "ä¸æ˜ŽæŒ‡ä»¤"
#. TRANSLATORS: party invite message
#. TRANSLATORS: unignore command
#. TRANSLATORS: erase command
-#: src/commands.cpp:152 src/commands.cpp:445 src/commands.cpp:532
-#: src/commands.cpp:586
+#: src/commands.cpp:154 src/commands.cpp:447 src/commands.cpp:534
+#: src/commands.cpp:588
msgid "Please specify a name."
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:159
+#: src/commands.cpp:161
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:171
+#: src/commands.cpp:173
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/commands.cpp:177
+#: src/commands.cpp:179
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: whisper send
-#: src/commands.cpp:349
+#: src/commands.cpp:351
msgid "Cannot send empty whispers!"
msgstr "傳é€å¯†èªžå¤±æ•—"
#. TRANSLATORS: new whisper query
-#: src/commands.cpp:367
+#: src/commands.cpp:369
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -732,167 +732,179 @@ msgstr "ä¸èƒ½ä»¥å稱 \"%s\" 創建一個密語標籤! 該å稱已存在或å°
#. TRANSLATORS: clear graphics command message
#. TRANSLATORS: clear fonts cache message
-#: src/commands.cpp:386 src/commands.cpp:397
+#: src/commands.cpp:388 src/commands.cpp:399
msgid "Cache cleaned"
msgstr ""
#. TRANSLATORS: create party message
#. TRANSLATORS: chat error message
-#: src/commands.cpp:409 src/net/ea/gui/partytab.cpp:155
+#: src/commands.cpp:411 src/net/ea/gui/partytab.cpp:155
msgid "Party name is missing."
msgstr "æ¼æŽ‰éšŠä¼å稱。"
#. TRANSLATORS: create guild message
-#: src/commands.cpp:425
+#: src/commands.cpp:427
msgid "Guild name is missing."
msgstr ""
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Return toggles chat."
msgstr "\"ENTER\"切æ›èŠå¤©"
-#: src/commands.cpp:462
+#: src/commands.cpp:464
msgid "Message closes chat."
msgstr "關閉密語"
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:473
+#: src/commands.cpp:475
msgid "Return now toggles chat."
msgstr "\"ENTER\"切æ›èŠå¤©"
#. TRANSLATORS: message from toggle chat command
-#: src/commands.cpp:482
+#: src/commands.cpp:484
msgid "Message now closes chat."
msgstr "切æ›èŠå¤©"
#. TRANSLATORS: adding friend command
-#: src/commands.cpp:510
+#: src/commands.cpp:512
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/commands.cpp:516
+#: src/commands.cpp:518
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/commands.cpp:522
+#: src/commands.cpp:524
msgid "neutral"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:547
+#: src/commands.cpp:549
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:557
+#: src/commands.cpp:559
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/commands.cpp:562
+#: src/commands.cpp:564
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/commands.cpp:570
+#: src/commands.cpp:572
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/commands.cpp:576
+#: src/commands.cpp:578
msgid "enemy"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:596
+#: src/commands.cpp:598
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:610
+#: src/commands.cpp:612
msgid "Player successfully erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/commands.cpp:615
+#: src/commands.cpp:617
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:905 src/commands.cpp:961
+#: src/commands.cpp:908 src/commands.cpp:964
#, c-format
msgid "Client uptime: %s"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d week"
msgstr ""
-#: src/commands.cpp:916
+#: src/commands.cpp:919
#, c-format
msgid "%d weeks"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d day"
msgstr ""
-#: src/commands.cpp:927
+#: src/commands.cpp:930
#, c-format
msgid "%d days"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hour"
msgstr ""
-#: src/commands.cpp:937
+#: src/commands.cpp:940
#, c-format
msgid "%d hours"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minute"
msgstr ""
-#: src/commands.cpp:947
+#: src/commands.cpp:950
#, c-format
msgid "%d minutes"
msgstr ""
#. TRANSLATORS: uptime command
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d second"
msgstr ""
-#: src/commands.cpp:957
+#: src/commands.cpp:960
#, c-format
msgid "%d seconds"
msgstr ""
#. TRANSLATORS: dump environment command
-#: src/commands.cpp:1115
+#: src/commands.cpp:1118
msgid "Environment variables dumped"
msgstr ""
+#: src/commands.cpp:1340
+msgid "Uploaded config into:"
+msgstr ""
+
+#: src/commands.cpp:1347
+msgid "Uploaded server config into:"
+msgstr ""
+
+#: src/commands.cpp:1354
+msgid "Uploaded log into:"
+msgstr ""
+
#. TRANSLATORS: dump command
-#: src/commands.cpp:1379 src/commands.cpp:1388
+#: src/commands.cpp:1474 src/commands.cpp:1483
msgid "Resource images:"
msgstr ""
#. TRANSLATORS: dump command
-#: src/commands.cpp:1382 src/commands.cpp:1391
+#: src/commands.cpp:1477 src/commands.cpp:1486
msgid "Resource orphaned images:"
msgstr ""
@@ -915,36 +927,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:273 src/gui/widgets/tabs/chattab.cpp:469
+#: src/game.cpp:274 src/gui/widgets/tabs/chattab.cpp:469
msgid "General"
msgstr "一般"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:289 src/gui/widgets/tabs/chattab.cpp:471
+#: src/game.cpp:290 src/gui/widgets/tabs/chattab.cpp:471
#: src/gui/windowmenu.cpp:152 src/gui/windows/debugwindow.cpp:52
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:550
+#: src/game.cpp:573
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:583
msgid "Saving screenshot failed!"
msgstr "儲存抓圖失敗!"
#. TRANSLATORS: error message text
-#: src/game.cpp:632
+#: src/game.cpp:654
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:635
+#: src/game.cpp:657
msgid "Network Error"
msgstr "網路錯誤"
@@ -981,7 +993,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: trade with player
#. TRANSLATORS: trade chat tab name
-#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:151 src/gui/popups/popupmenu.cpp:690
#: src/gui/widgets/tabs/tradetab.cpp:33
msgid "Trade"
msgstr "交易"
@@ -996,7 +1008,7 @@ msgstr "交易"
#. TRANSLATORS: bot checker window table header
#. TRANSLATORS: player stat
#: src/gui/popups/popupmenu.cpp:154 src/gui/popups/popupmenu.cpp:258
-#: src/gui/popups/popupmenu.cpp:694 src/gui/setupactiondata.h:51
+#: src/gui/popups/popupmenu.cpp:693 src/gui/setupactiondata.h:51
#: src/gui/windows/botcheckerwindow.cpp:303
#: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:288
msgid "Attack"
@@ -1004,34 +1016,34 @@ msgstr "攻擊"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:365
+#: src/gui/popups/popupmenu.cpp:157 src/gui/popups/popupmenu.cpp:364
msgid "Whisper"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:698
+#: src/gui/popups/popupmenu.cpp:163 src/gui/popups/popupmenu.cpp:697
msgid "Heal"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from guild
#: src/gui/popups/popupmenu.cpp:183 src/gui/popups/popupmenu.cpp:199
-#: src/gui/popups/popupmenu.cpp:411 src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:410 src/gui/popups/popupmenu.cpp:744
msgid "Kick from guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: change player position in guild
#: src/gui/popups/popupmenu.cpp:190 src/gui/popups/popupmenu.cpp:206
-#: src/gui/popups/popupmenu.cpp:418 src/gui/popups/popupmenu.cpp:752
+#: src/gui/popups/popupmenu.cpp:417 src/gui/popups/popupmenu.cpp:751
msgid "Change pos in guild"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:428
-#: src/gui/popups/popupmenu.cpp:763
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:427
+#: src/gui/popups/popupmenu.cpp:762
msgid "Invite to guild"
msgstr ""
@@ -1056,8 +1068,8 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: bot checker window table header
#: src/gui/popups/popupmenu.cpp:226 src/gui/popups/popupmenu.cpp:247
-#: src/gui/popups/popupmenu.cpp:395 src/gui/popups/popupmenu.cpp:546
-#: src/gui/popups/popupmenu.cpp:705 src/gui/popups/popupmenu.cpp:786
+#: src/gui/popups/popupmenu.cpp:394 src/gui/popups/popupmenu.cpp:545
+#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:785
#: src/gui/setupactiondata.h:1918 src/gui/windows/botcheckerwindow.cpp:307
msgid "Move"
msgstr ""
@@ -1077,7 +1089,7 @@ msgstr "說話"
#. TRANSLATORS: buy item
#. TRANSLATORS: buy dialog name
#. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2598
+#: src/gui/popups/popupmenu.cpp:240 src/gui/popups/popupmenu.cpp:2597
#: src/gui/windows/buydialog.cpp:207 src/gui/windows/buydialog.cpp:219
#: src/gui/windows/buydialog.cpp:273 src/gui/windows/buyselldialog.cpp:67
msgid "Buy"
@@ -1090,7 +1102,7 @@ msgstr "購買"
#. TRANSLATORS: shop window button
#. TRANSLATORS: sell dialog name
#. TRANSLATORS: sell dialog button
-#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:2600
#: src/gui/windows/buyselldialog.cpp:69 src/gui/windows/selldialog.cpp:55
#: src/gui/windows/selldialog.cpp:65 src/gui/windows/selldialog.cpp:107
msgid "Sell"
@@ -1100,8 +1112,8 @@ msgstr "出售"
#. TRANSLATORS: add comment to npc
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:375
-#: src/gui/popups/popupmenu.cpp:2662
+#: src/gui/popups/popupmenu.cpp:250 src/gui/popups/popupmenu.cpp:374
+#: src/gui/popups/popupmenu.cpp:2661
msgid "Add comment"
msgstr ""
@@ -1127,7 +1139,7 @@ msgstr ""
#. TRANSLATORS: add monster to ignore list
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2682
+#: src/gui/popups/popupmenu.cpp:285 src/gui/popups/popupmenu.cpp:2681
msgid "Add to ignore list"
msgstr ""
@@ -1135,7 +1147,7 @@ msgstr ""
#. TRANSLATORS: add being name to chat
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:302 src/gui/popups/popupmenu.cpp:436
+#: src/gui/popups/popupmenu.cpp:301 src/gui/popups/popupmenu.cpp:435
msgid "Add name to chat"
msgstr ""
@@ -1158,19 +1170,19 @@ msgstr ""
#. TRANSLATORS: text dialog button
#. TRANSLATORS: unregister dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/popups/popupmenu.cpp:307 src/gui/popups/popupmenu.cpp:342
-#: src/gui/popups/popupmenu.cpp:440 src/gui/popups/popupmenu.cpp:487
-#: src/gui/popups/popupmenu.cpp:522 src/gui/popups/popupmenu.cpp:553
-#: src/gui/popups/popupmenu.cpp:573 src/gui/popups/popupmenu.cpp:598
-#: src/gui/popups/popupmenu.cpp:797 src/gui/popups/popupmenu.cpp:824
-#: src/gui/popups/popupmenu.cpp:1956 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2084
-#: src/gui/popups/popupmenu.cpp:2125 src/gui/popups/popupmenu.cpp:2193
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2305
-#: src/gui/popups/popupmenu.cpp:2331 src/gui/popups/popupmenu.cpp:2353
-#: src/gui/popups/popupmenu.cpp:2376 src/gui/popups/popupmenu.cpp:2403
-#: src/gui/popups/popupmenu.cpp:2420 src/gui/popups/popupmenu.cpp:2700
-#: src/gui/popups/popupmenu.cpp:2836 src/gui/setupactiondata.h:1803
+#: src/gui/popups/popupmenu.cpp:306 src/gui/popups/popupmenu.cpp:341
+#: src/gui/popups/popupmenu.cpp:439 src/gui/popups/popupmenu.cpp:486
+#: src/gui/popups/popupmenu.cpp:521 src/gui/popups/popupmenu.cpp:552
+#: src/gui/popups/popupmenu.cpp:572 src/gui/popups/popupmenu.cpp:597
+#: src/gui/popups/popupmenu.cpp:796 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1955 src/gui/popups/popupmenu.cpp:1991
+#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2083
+#: src/gui/popups/popupmenu.cpp:2124 src/gui/popups/popupmenu.cpp:2192
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2375 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:2419 src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2835 src/gui/setupactiondata.h:1803
#: src/gui/windows/buyselldialog.cpp:71
#: src/gui/windows/changeemaildialog.cpp:55
#: src/gui/windows/changepassworddialog.cpp:57
@@ -1183,44 +1195,44 @@ msgstr ""
#: src/gui/windows/socialwindow.cpp:1231
#: src/gui/windows/textcommandeditor.cpp:201 src/gui/windows/textdialog.cpp:55
#: src/gui/windows/unregisterdialog.cpp:54
-#: src/gui/windows/updaterwindow.cpp:180
+#: src/gui/windows/updaterwindow.cpp:185
msgid "Cancel"
msgstr "å–消"
#. TRANSLATORS: popup menu header
#. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:319 src/gui/widgets/tabs/setup_players.cpp:37
+#: src/gui/popups/popupmenu.cpp:318 src/gui/widgets/tabs/setup_players.cpp:37
msgid "Players"
msgstr "玩家"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:387 src/gui/popups/popupmenu.cpp:726
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:725
+#: src/gui/popups/popupmenu.cpp:2645
msgid "Kick from party"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:469 src/gui/popups/popupmenu.cpp:478
+#: src/gui/popups/popupmenu.cpp:468 src/gui/popups/popupmenu.cpp:477
msgid "Pick up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:483 src/gui/popups/popupmenu.cpp:1952
-#: src/gui/popups/popupmenu.cpp:2028 src/gui/popups/popupmenu.cpp:2070
+#: src/gui/popups/popupmenu.cpp:482 src/gui/popups/popupmenu.cpp:1951
+#: src/gui/popups/popupmenu.cpp:2027 src/gui/popups/popupmenu.cpp:2069
msgid "Add to chat"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:536
+#: src/gui/popups/popupmenu.cpp:503 src/gui/popups/popupmenu.cpp:535
msgid "Map Item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:507
+#: src/gui/popups/popupmenu.cpp:506
msgid "Rename"
msgstr ""
@@ -1230,20 +1242,20 @@ msgstr ""
#. TRANSLATORS: remove attack target
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:2267
-#: src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:509 src/gui/popups/popupmenu.cpp:2266
+#: src/gui/popups/popupmenu.cpp:2300
msgid "Remove"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: warp to map item
-#: src/gui/popups/popupmenu.cpp:517 src/gui/popups/popupmenu.cpp:542
+#: src/gui/popups/popupmenu.cpp:516 src/gui/popups/popupmenu.cpp:541
msgid "Warp"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:549
+#: src/gui/popups/popupmenu.cpp:548
msgid "Move camera"
msgstr ""
@@ -1252,7 +1264,7 @@ msgstr ""
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:566 src/gui/setupactiondata.h:1926
+#: src/gui/popups/popupmenu.cpp:565 src/gui/setupactiondata.h:1926
#: src/gui/windowmenu.cpp:148 src/gui/windows/inventorywindow.cpp:224
#: src/gui/windows/outfitwindow.cpp:53
msgid "Outfits"
@@ -1260,69 +1272,69 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:569
+#: src/gui/popups/popupmenu.cpp:568
msgid "Clear outfit"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: full button name
-#: src/gui/popups/popupmenu.cpp:591 src/gui/windowmenu.cpp:132
+#: src/gui/popups/popupmenu.cpp:590 src/gui/windowmenu.cpp:132
msgid "Spells"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:594
+#: src/gui/popups/popupmenu.cpp:593
msgid "Edit spell"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove all text from chat tab
#. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:623 src/gui/windows/npcdialog.cpp:106
+#: src/gui/popups/popupmenu.cpp:622 src/gui/windows/npcdialog.cpp:106
msgid "Clear"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:630
+#: src/gui/popups/popupmenu.cpp:629
msgid "Disable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:636
+#: src/gui/popups/popupmenu.cpp:635
msgid "Enable highlight"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:642
+#: src/gui/popups/popupmenu.cpp:641
msgid "Don't remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:648
+#: src/gui/popups/popupmenu.cpp:647
msgid "Remove name"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:654
+#: src/gui/popups/popupmenu.cpp:653
msgid "Enable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:660
+#: src/gui/popups/popupmenu.cpp:659
msgid "Disable away"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: enable away messages in chat tab
#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:667 src/gui/windows/socialwindow.cpp:1303
+#: src/gui/popups/popupmenu.cpp:666 src/gui/windows/socialwindow.cpp:1303
msgid "Leave"
msgstr ""
@@ -1332,68 +1344,68 @@ msgstr ""
#. TRANSLATORS: copy link to clipboard
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:672 src/gui/popups/popupmenu.cpp:2372
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2415
msgid "Copy to clipboard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:719 src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:718 src/gui/popups/popupmenu.cpp:2639
msgid "Invite to party"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:806
+#: src/gui/popups/popupmenu.cpp:805
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1329
+#: src/gui/popups/popupmenu.cpp:1328
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1331
+#: src/gui/popups/popupmenu.cpp:1330
msgid "Name: "
msgstr ""
-#: src/gui/popups/popupmenu.cpp:1355
+#: src/gui/popups/popupmenu.cpp:1354
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1357
+#: src/gui/popups/popupmenu.cpp:1356
msgid "Comment: "
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1869
+#: src/gui/popups/popupmenu.cpp:1868
msgid "Add to trade"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1876
+#: src/gui/popups/popupmenu.cpp:1875
msgid "Add to trade 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1880
+#: src/gui/popups/popupmenu.cpp:1879
msgid "Add to trade half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1883
+#: src/gui/popups/popupmenu.cpp:1882
msgid "Add to trade all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1886
+#: src/gui/popups/popupmenu.cpp:1885
msgid "Add to trade all"
msgstr ""
@@ -1402,64 +1414,64 @@ msgstr ""
#. TRANSLATORS: storage button
#. TRANSLATORS: inventory button
#. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2024
-#: src/gui/popups/popupmenu.cpp:2065 src/gui/windows/inventorywindow.cpp:254
+#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:2023
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/windows/inventorywindow.cpp:254
#: src/gui/windows/inventorywindow.cpp:780 src/gui/windows/setup.cpp:94
msgid "Store"
msgstr "寄放"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1901
+#: src/gui/popups/popupmenu.cpp:1900
msgid "Store 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1905
+#: src/gui/popups/popupmenu.cpp:1904
msgid "Store half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all except one item amount to storage
-#: src/gui/popups/popupmenu.cpp:1908
+#: src/gui/popups/popupmenu.cpp:1907
msgid "Store all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1911
+#: src/gui/popups/popupmenu.cpp:1910
msgid "Store all"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get item from storage
#. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1923 src/gui/windows/inventorywindow.cpp:256
+#: src/gui/popups/popupmenu.cpp:1922 src/gui/windows/inventorywindow.cpp:256
msgid "Retrieve"
msgstr "å–回"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1930
+#: src/gui/popups/popupmenu.cpp:1929
msgid "Retrieve 10"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1934
+#: src/gui/popups/popupmenu.cpp:1933
msgid "Retrieve half"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1937
+#: src/gui/popups/popupmenu.cpp:1936
msgid "Retrieve all-1"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1939
msgid "Retrieve all"
msgstr ""
@@ -1467,42 +1479,42 @@ msgstr ""
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: skills dialog button
-#: src/gui/popups/popupmenu.cpp:1986 src/gui/popups/popupmenu.cpp:2764
+#: src/gui/popups/popupmenu.cpp:1985 src/gui/popups/popupmenu.cpp:2763
#: src/gui/windows/inventorywindow.cpp:205
#: src/gui/windows/inventorywindow.cpp:691 src/gui/windows/skilldialog.cpp:290
msgid "Use"
msgstr "使用"
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2080
+#: src/gui/popups/popupmenu.cpp:2079
msgid "Clear drop window"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111 src/gui/popups/popupmenu.cpp:2172
+#: src/gui/popups/popupmenu.cpp:2110 src/gui/popups/popupmenu.cpp:2171
msgid "Hide"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2118 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2117 src/gui/popups/popupmenu.cpp:2178
msgid "Show"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:2185
msgid "Reset yellow bar"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy status to chat
#. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/windows/statuswindow.cpp:168
+#: src/gui/popups/popupmenu.cpp:2189 src/gui/windows/statuswindow.cpp:168
msgid "Copy to chat"
msgstr ""
#. TRANSLATORS: popup menu header
#. TRANSLATORS: language
-#: src/gui/popups/popupmenu.cpp:2214 src/gui/popups/popupmenu.cpp:2292
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/popupmenu.cpp:2291
#: src/gui/widgets/tabs/setup_theme.cpp:60
#: src/gui/widgets/tabs/setup_theme.cpp:147
#: src/gui/windows/socialwindow.cpp:997
@@ -1511,13 +1523,13 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2230 src/gui/popups/popupmenu.cpp:2249
+#: src/gui/popups/popupmenu.cpp:2229 src/gui/popups/popupmenu.cpp:2248
msgid "Move up"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2236 src/gui/popups/popupmenu.cpp:2255
+#: src/gui/popups/popupmenu.cpp:2235 src/gui/popups/popupmenu.cpp:2254
msgid "Move down"
msgstr ""
@@ -1525,134 +1537,134 @@ msgstr ""
#. TRANSLATORS: undress item from player
#. TRANSLATORS: popup menu item
#. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2659
+#: src/gui/popups/popupmenu.cpp:2326 src/gui/popups/popupmenu.cpp:2658
msgid "Undress"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2345
msgid "Copy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2349
+#: src/gui/popups/popupmenu.cpp:2348
msgid "Paste"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2369
+#: src/gui/popups/popupmenu.cpp:2368
msgid "Open link"
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2389
+#: src/gui/popups/popupmenu.cpp:2388
msgid "Show window"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:2464
msgid "Be friend"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2468 src/gui/popups/popupmenu.cpp:2486
-#: src/gui/popups/popupmenu.cpp:2507 src/gui/popups/popupmenu.cpp:2546
-#: src/gui/popups/popupmenu.cpp:2564
+#: src/gui/popups/popupmenu.cpp:2467 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2506 src/gui/popups/popupmenu.cpp:2545
+#: src/gui/popups/popupmenu.cpp:2563
msgid "Disregard"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to ignore list
#. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2471 src/gui/popups/popupmenu.cpp:2489
-#: src/gui/popups/popupmenu.cpp:2510 src/gui/popups/popupmenu.cpp:2549
+#: src/gui/popups/popupmenu.cpp:2470 src/gui/popups/popupmenu.cpp:2488
+#: src/gui/popups/popupmenu.cpp:2509 src/gui/popups/popupmenu.cpp:2548
#: src/gui/windows/confirmdialog.cpp:60
msgid "Ignore"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2474 src/gui/popups/popupmenu.cpp:2492
-#: src/gui/popups/popupmenu.cpp:2552
+#: src/gui/popups/popupmenu.cpp:2473 src/gui/popups/popupmenu.cpp:2491
+#: src/gui/popups/popupmenu.cpp:2551
msgid "Black list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2477 src/gui/popups/popupmenu.cpp:2495
-#: src/gui/popups/popupmenu.cpp:2513
+#: src/gui/popups/popupmenu.cpp:2476 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2512
msgid "Set as enemy"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2480 src/gui/popups/popupmenu.cpp:2498
-#: src/gui/popups/popupmenu.cpp:2516 src/gui/popups/popupmenu.cpp:2528
-#: src/gui/popups/popupmenu.cpp:2537 src/gui/popups/popupmenu.cpp:2555
+#: src/gui/popups/popupmenu.cpp:2479 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2515 src/gui/popups/popupmenu.cpp:2527
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2554
msgid "Erase"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2504 src/gui/popups/popupmenu.cpp:2522
-#: src/gui/popups/popupmenu.cpp:2534 src/gui/popups/popupmenu.cpp:2543
-#: src/gui/popups/popupmenu.cpp:2561
+#: src/gui/popups/popupmenu.cpp:2503 src/gui/popups/popupmenu.cpp:2521
+#: src/gui/popups/popupmenu.cpp:2533 src/gui/popups/popupmenu.cpp:2542
+#: src/gui/popups/popupmenu.cpp:2560
msgid "Unignore"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2580
+#: src/gui/popups/popupmenu.cpp:2579
msgid "Follow"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2584
+#: src/gui/popups/popupmenu.cpp:2583
msgid "Imitation"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2608 src/gui/popups/popupmenu.cpp:2623
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
msgid "Buy (?)"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2611 src/gui/popups/popupmenu.cpp:2626
+#: src/gui/popups/popupmenu.cpp:2610 src/gui/popups/popupmenu.cpp:2625
msgid "Sell (?)"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2655
msgid "Show Items"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2673
+#: src/gui/popups/popupmenu.cpp:2672
msgid "Remove from pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2677
msgid "Add to pickup list"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2727
+#: src/gui/popups/popupmenu.cpp:2726
msgid "Unprotect item"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2736
+#: src/gui/popups/popupmenu.cpp:2735
msgid "Protect item"
msgstr ""
@@ -1660,7 +1672,7 @@ msgstr ""
#. TRANSLATORS: unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2749 src/gui/windows/equipmentwindow.cpp:68
+#: src/gui/popups/popupmenu.cpp:2748 src/gui/windows/equipmentwindow.cpp:68
#: src/gui/windows/inventorywindow.cpp:207
#: src/gui/windows/inventorywindow.cpp:680
msgid "Unequip"
@@ -1670,7 +1682,7 @@ msgstr "å¸ä¸‹è£å‚™"
#. TRANSLATORS: use item
#. TRANSLATORS: inventory button
#. TRANSLATORS: outfits window button
-#: src/gui/popups/popupmenu.cpp:2755 src/gui/windows/inventorywindow.cpp:203
+#: src/gui/popups/popupmenu.cpp:2754 src/gui/windows/inventorywindow.cpp:203
#: src/gui/windows/inventorywindow.cpp:685 src/gui/windows/outfitwindow.cpp:60
msgid "Equip"
msgstr "è£å‚™"
@@ -1678,14 +1690,14 @@ msgstr "è£å‚™"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop item
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2775 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/popups/popupmenu.cpp:2774 src/gui/windows/inventorywindow.cpp:220
#: src/gui/windows/inventorywindow.cpp:788
msgid "Drop..."
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2777
msgid "Drop all"
msgstr ""
@@ -1693,7 +1705,7 @@ msgstr ""
#. TRANSLATORS: drop item
#. TRANSLATORS: full button name
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2784 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:2783 src/gui/windowmenu.cpp:136
#: src/gui/windows/inventorywindow.cpp:793
msgid "Drop"
msgstr "丟棄"
@@ -1701,48 +1713,48 @@ msgstr "丟棄"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: split items
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2792 src/gui/windows/inventorywindow.cpp:222
+#: src/gui/popups/popupmenu.cpp:2791 src/gui/windows/inventorywindow.cpp:222
msgid "Split"
msgstr "分開"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2802
+#: src/gui/popups/popupmenu.cpp:2801
msgid "GM..."
msgstr ""
#. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2810
+#: src/gui/popups/popupmenu.cpp:2809
msgid "GM commands"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2815
+#: src/gui/popups/popupmenu.cpp:2814
msgid "Check ip"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2818
+#: src/gui/popups/popupmenu.cpp:2817
msgid "Goto"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2821
+#: src/gui/popups/popupmenu.cpp:2820
msgid "Recall"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
-#: src/gui/popups/popupmenu.cpp:2824
+#: src/gui/popups/popupmenu.cpp:2823
msgid "Revive"
msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2829
+#: src/gui/popups/popupmenu.cpp:2828
msgid "Kick"
msgstr ""
@@ -2405,7 +2417,7 @@ msgstr ""
#: src/gui/widgets/tabs/setup_audio.cpp:159
#: src/gui/widgets/tabs/setup_chat.cpp:180
#: src/gui/widgets/tabs/setup_other.cpp:329
-#: src/gui/widgets/tabs/setup_visual.cpp:175
+#: src/gui/widgets/tabs/setup_visual.cpp:188
#: src/gui/windows/charcreatedialog.cpp:107
#: src/gui/windows/registerdialog.cpp:115
msgid "Other"
@@ -2573,7 +2585,7 @@ msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:140
+#: src/gui/userpalette.cpp:140 src/gui/widgets/tabs/setup_visual.cpp:153
msgid "Particle effects"
msgstr "ç²’å­æ•ˆæžœ"
@@ -2707,13 +2719,13 @@ msgstr ""
msgid "Tiles border"
msgstr ""
-#: src/gui/widgets/characterdisplay.cpp:131
+#: src/gui/widgets/characterdisplay.cpp:134
#, c-format
msgid "Level: %u"
msgstr ""
#. TRANSLATORS: status window label
-#: src/gui/widgets/characterdisplay.cpp:133
+#: src/gui/widgets/characterdisplay.cpp:136
#: src/gui/windows/inventorywindow.cpp:598
#: src/gui/windows/statuswindow.cpp:149 src/gui/windows/statuswindow.cpp:312
#: src/gui/windows/statuswindow.cpp:365
@@ -2793,7 +2805,7 @@ msgstr ""
#. TRANSLATORS: setup item button
#. TRANSLATORS: servers dialog button
-#: src/gui/widgets/setupitem.cpp:317 src/gui/widgets/setupitem.cpp:453
+#: src/gui/widgets/setupitem.cpp:363 src/gui/widgets/setupitem.cpp:499
#: src/gui/windows/serverdialog.cpp:260
msgid "Edit"
msgstr ""
@@ -3402,12 +3414,12 @@ msgid "Rotate the stick and don't press buttons"
msgstr ""
#. TRANSLATORS: mods tab in settings
-#: src/gui/widgets/tabs/setup_mods.cpp:42
+#: src/gui/widgets/tabs/setup_mods.cpp:41
msgid "Mods"
msgstr ""
#. TRANSLATORS: settings label
-#: src/gui/widgets/tabs/setup_mods.cpp:77
+#: src/gui/widgets/tabs/setup_mods.cpp:76
msgid "No mods present"
msgstr ""
@@ -3456,14 +3468,14 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:73
#: src/gui/widgets/tabs/setup_visual.cpp:55
-#: src/gui/widgets/tabs/setup_visual.cpp:144
+#: src/gui/widgets/tabs/setup_visual.cpp:157
msgid "low"
msgstr "低"
#. TRANSLATORS: screen density type
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:75
-#: src/gui/widgets/tabs/setup_visual.cpp:146
+#: src/gui/widgets/tabs/setup_visual.cpp:159
msgid "medium"
msgstr "中"
@@ -3477,7 +3489,7 @@ msgstr ""
#. TRANSLATORS: particle details
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:57
-#: src/gui/widgets/tabs/setup_visual.cpp:148
+#: src/gui/widgets/tabs/setup_visual.cpp:161
msgid "high"
msgstr "高"
@@ -3832,17 +3844,22 @@ msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:375
+#: src/gui/widgets/tabs/setup_other.cpp:376
+msgid "Screenshot directory"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:379
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:384
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Screen density override"
msgstr ""
@@ -4352,8 +4369,8 @@ msgstr ""
#. TRANSLATORS: video settings warning
#: src/gui/widgets/tabs/setup_theme.cpp:517
-#: src/gui/widgets/tabs/setup_video.cpp:493
-#: src/gui/widgets/tabs/setup_video.cpp:502
+#: src/gui/widgets/tabs/setup_video.cpp:495
+#: src/gui/widgets/tabs/setup_video.cpp:504
msgid "Restart your client for the change to take effect."
msgstr "è«‹é‡æ–°å•Ÿå‹•æ‚¨çš„客戶端讓變更生效。"
@@ -4452,8 +4469,8 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:194
#: src/gui/widgets/tabs/setup_video.cpp:236
-#: src/gui/widgets/tabs/setup_video.cpp:424
-#: src/gui/widgets/tabs/setup_video.cpp:551
+#: src/gui/widgets/tabs/setup_video.cpp:425
+#: src/gui/widgets/tabs/setup_video.cpp:553
msgid "Alt FPS limit: "
msgstr ""
@@ -4485,61 +4502,61 @@ msgstr ""
#. TRANSLATORS: video settings label
#: src/gui/widgets/tabs/setup_video.cpp:233
#: src/gui/widgets/tabs/setup_video.cpp:237
-#: src/gui/widgets/tabs/setup_video.cpp:422
-#: src/gui/widgets/tabs/setup_video.cpp:535
-#: src/gui/widgets/tabs/setup_video.cpp:548
+#: src/gui/widgets/tabs/setup_video.cpp:423
+#: src/gui/widgets/tabs/setup_video.cpp:537
+#: src/gui/widgets/tabs/setup_video.cpp:550
msgid "None"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:344
+#: src/gui/widgets/tabs/setup_video.cpp:345
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:351
+#: src/gui/widgets/tabs/setup_video.cpp:352
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:363
+#: src/gui/widgets/tabs/setup_video.cpp:364
msgid "Switching to Full Screen"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:365
+#: src/gui/widgets/tabs/setup_video.cpp:366
msgid "Restart needed for changes to take effect."
msgstr "è«‹é‡æ–°å•Ÿå‹•"
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
+#: src/gui/widgets/tabs/setup_video.cpp:384
msgid "Changing to OpenGL"
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:385
+#: src/gui/widgets/tabs/setup_video.cpp:386
msgid "Applying change to OpenGL requires restart."
msgstr "確èªåˆ‡æ›OpenGL需è¦é‡æ–°é–‹å§‹"
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:463
+#: src/gui/widgets/tabs/setup_video.cpp:464
msgid "Custom resolution (example: 1024x768)"
msgstr ""
#. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:465
+#: src/gui/widgets/tabs/setup_video.cpp:466
msgid "Enter new resolution: "
msgstr ""
#. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:491
-#: src/gui/widgets/tabs/setup_video.cpp:500
+#: src/gui/widgets/tabs/setup_video.cpp:493
+#: src/gui/widgets/tabs/setup_video.cpp:502
msgid "Screen Resolution Changed"
msgstr ""
-#: src/gui/widgets/tabs/setup_video.cpp:494
+#: src/gui/widgets/tabs/setup_video.cpp:496
msgid "Some windows may be moved to fit the lowered resolution."
msgstr ""
@@ -4591,93 +4608,102 @@ msgid "on"
msgstr ""
#. TRANSLATORS: settings tab name
-#: src/gui/widgets/tabs/setup_visual.cpp:93
+#: src/gui/widgets/tabs/setup_visual.cpp:94
msgid "Visual"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:102
+#: src/gui/widgets/tabs/setup_visual.cpp:103
+msgid "Scale"
+msgstr ""
+
+#: src/gui/widgets/tabs/setup_visual.cpp:110
+msgid "Scale "
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_visual.cpp:115
msgid "Notifications"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:105
+#: src/gui/widgets/tabs/setup_visual.cpp:118
msgid "Show pickup notifications in chat"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:109
+#: src/gui/widgets/tabs/setup_visual.cpp:122
msgid "Show pickup notifications as particle effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:113
+#: src/gui/widgets/tabs/setup_visual.cpp:126
msgid "Effects"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:117
+#: src/gui/widgets/tabs/setup_visual.cpp:130
msgid "Grab mouse and keyboard input"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:122
+#: src/gui/widgets/tabs/setup_visual.cpp:135
msgid "Blurring textures (OpenGL)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:126
+#: src/gui/widgets/tabs/setup_visual.cpp:139
msgid "Gui opacity"
msgstr "Gui é€æ˜Žåº¦"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:131
+#: src/gui/widgets/tabs/setup_visual.cpp:144
msgid "Overhead text"
msgstr "置頂文字"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:136
+#: src/gui/widgets/tabs/setup_visual.cpp:149
msgid "Ambient FX"
msgstr "環境效果"
#. TRANSLATORS: particle details
-#: src/gui/widgets/tabs/setup_visual.cpp:150
+#: src/gui/widgets/tabs/setup_visual.cpp:163
msgid "max"
msgstr "最大"
-#: src/gui/widgets/tabs/setup_visual.cpp:151
+#: src/gui/widgets/tabs/setup_visual.cpp:164
msgid "Particle detail"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:158
+#: src/gui/widgets/tabs/setup_visual.cpp:171
msgid "Particle physics"
msgstr ""
#. TRANSLATORS: settings group
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:163
-#: src/gui/widgets/tabs/setup_visual.cpp:170
+#: src/gui/widgets/tabs/setup_visual.cpp:176
+#: src/gui/widgets/tabs/setup_visual.cpp:183
msgid "Gamma"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:166
+#: src/gui/widgets/tabs/setup_visual.cpp:179
msgid "Enable gamma control"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:179
+#: src/gui/widgets/tabs/setup_visual.cpp:192
msgid "Vsync"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:184
+#: src/gui/widgets/tabs/setup_visual.cpp:197
msgid "Center game window"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_visual.cpp:189
+#: src/gui/widgets/tabs/setup_visual.cpp:202
msgid "Allow screensaver to run"
msgstr ""
@@ -5233,7 +5259,7 @@ msgstr ""
#. TRANSLATORS: updater window button
#: src/gui/windows/charselectdialog.cpp:102
#: src/gui/windows/charselectdialog.cpp:586
-#: src/gui/windows/updaterwindow.cpp:182
+#: src/gui/windows/updaterwindow.cpp:187
msgid "Play"
msgstr "開始"
@@ -5316,7 +5342,7 @@ msgid "Whispering to %s: %s"
msgstr "å°%sç«Šç«Šç§èªžï¼š%s"
#. TRANSLATORS: owners pet name. For example: 4144's pet
-#: src/gui/windows/chatwindow.cpp:1590
+#: src/gui/windows/chatwindow.cpp:1613
#, c-format
msgid "%s's pet"
msgstr ""
@@ -6048,33 +6074,33 @@ msgid "Use same ip for game sub servers"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:529
+#: src/gui/windows/serverdialog.cpp:532
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:535
+#: src/gui/windows/serverdialog.cpp:538
msgid "Waiting for server..."
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:540
+#: src/gui/windows/serverdialog.cpp:543
msgid "Preparing download"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:545
+#: src/gui/windows/serverdialog.cpp:548
msgid "Error retreiving server list!"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:635
+#: src/gui/windows/serverdialog.cpp:639
msgid "requires a newer version"
msgstr ""
#. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:640
+#: src/gui/windows/serverdialog.cpp:644
#, c-format
msgid "requires v%s"
msgstr ""
@@ -6636,36 +6662,36 @@ msgid "Name: %s"
msgstr "å字:%s"
#. TRANSLATORS: updater window name
-#: src/gui/windows/updaterwindow.cpp:153
+#: src/gui/windows/updaterwindow.cpp:158
msgid "Updating..."
msgstr "更新中..."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:178
+#: src/gui/windows/updaterwindow.cpp:183
msgid "Connecting..."
msgstr "連線中..."
-#: src/gui/windows/updaterwindow.cpp:364
+#: src/gui/windows/updaterwindow.cpp:369
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:751
+#: src/gui/windows/updaterwindow.cpp:757
msgid "##1 The update process is incomplete."
msgstr "##1 更新的程åºä¸å®Œæ•´ã€‚"
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:753
+#: src/gui/windows/updaterwindow.cpp:759
msgid "##1 It is strongly recommended that"
msgstr "##1 強烈建議"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:755
+#: src/gui/windows/updaterwindow.cpp:761
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:933
+#: src/gui/windows/updaterwindow.cpp:939
msgid "Completed"
msgstr "已完æˆ"
@@ -6712,25 +6738,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:369 src/input/inputmanager.cpp:413
+#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:428
#: src/input/keyboardconfig.cpp:101
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:375
+#: src/input/inputmanager.cpp:390
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:389
+#: src/input/inputmanager.cpp:404
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:419
+#: src/input/inputmanager.cpp:434
#, c-format
msgid "JB%d"
msgstr ""
@@ -6738,7 +6764,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:433 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:448 src/input/keyboardconfig.cpp:145
msgid "u key"
msgstr ""
@@ -7915,43 +7941,43 @@ msgstr ""
#. TRANSLATORS: unknown info name
#. TRANSLATORS: being info default name
#: src/resources/beinginfo.cpp:41 src/resources/db/avatardb.cpp:87
-#: src/resources/db/itemdb.cpp:326 src/resources/db/moddb.cpp:78
+#: src/resources/db/itemdb.cpp:329 src/resources/db/moddb.cpp:78
#: src/resources/db/monsterdb.cpp:109 src/resources/modinfo.cpp:29
msgid "unnamed"
msgstr "未知物å“"
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:74
+#: src/resources/db/itemdb.cpp:77
#, c-format
msgid "Attack %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:76
+#: src/resources/db/itemdb.cpp:79
#, c-format
msgid "Defense %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:78
+#: src/resources/db/itemdb.cpp:81
#, c-format
msgid "HP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:80
+#: src/resources/db/itemdb.cpp:83
#, c-format
msgid "MP %s"
msgstr ""
#. TRANSLATORS: item info label
-#: src/resources/db/itemdb.cpp:82
+#: src/resources/db/itemdb.cpp:85
#, c-format
msgid "Level %s"
msgstr ""
#. TRANSLATORS: item name
-#: src/resources/db/itemdb.cpp:206
+#: src/resources/db/itemdb.cpp:209
msgid "Unknown item"
msgstr "ä¸æ˜Žçš„物å“"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 67943d365..059eef64f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,7 +47,7 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL Linux)
SET(EXTRA_LIBRARIES rt)
ENDIF()
-SET(FLAGS "${FLAGS} -DUSE_MUMBLE")
+SET(FLAGS "${FLAGS} -DUSE_MUMBLE -DUSE_INTERNALGUICHAN")
IF (WITH_OPENGL)
FIND_PACKAGE(OpenGL REQUIRED)
@@ -796,7 +796,6 @@ SET(SRCS_GUICHAN
guichan/include/guichan/mouseevent.hpp
guichan/include/guichan/mouseinput.hpp
guichan/include/guichan/mouselistener.hpp
- guichan/include/guichan/platform.hpp
guichan/include/guichan/rectangle.hpp
guichan/include/guichan/selectionevent.hpp
guichan/include/guichan/selectionlistener.hpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 7d6abb875..ba0fbc800 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -189,7 +189,6 @@ manaplus_SOURCES += guichan/include/guichan/actionevent.hpp \
guichan/include/guichan/mouseevent.hpp \
guichan/include/guichan/mouseinput.hpp \
guichan/include/guichan/mouselistener.hpp \
- guichan/include/guichan/platform.hpp \
guichan/include/guichan/rectangle.hpp \
guichan/include/guichan/selectionevent.hpp \
guichan/include/guichan/selectionlistener.hpp \
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index cc04e60a1..bc7be23a9 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -211,11 +211,11 @@ impHandler(outfit)
impHandler0(mouseClick)
{
- if (!guiInput)
+ if (!guiInput || !gui)
return false;
int mouseX, mouseY;
- SDL_GetMouseState(&mouseX, &mouseY);
+ gui->getMouseState(&mouseX, &mouseY);
guiInput->simulateMouseClick(mouseX, mouseY, gcn::MouseEvent::RIGHT);
return true;
}
@@ -388,7 +388,7 @@ impHandler0(heal)
{
if (actorManager)
{
- if (inputManager.isActionActive(Input::KEY_MOD))
+ if (inputManager.isActionActive(Input::KEY_STOP_ATTACK))
{
Being *target = player_node->getTarget();
if (!target || target->getType() != ActorSprite::PLAYER)
diff --git a/src/being/being.cpp b/src/being/being.cpp
index aa2b875af..f9667ca33 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -134,6 +134,8 @@ Being::Being(const int id, const Type type, const uint16_t subtype,
mAttackSpeed(350),
mLevel(0),
mAttackRange(1),
+ mLastAttackX(0),
+ mLastAttackY(0),
mGender(GENDER_UNSPECIFIED),
mAction(STAND),
mSubType(0xFFFF),
@@ -760,6 +762,9 @@ void Being::handleAttack(Being *const victim, const int damage,
if (this != player_node)
setAction(Being::ATTACK, attackId);
+ mLastAttackX = victim->getTileX();
+ mLastAttackY = victim->getTileY();
+
if (mType == PLAYER && mEquippedWeapon)
fireMissile(victim, mEquippedWeapon->getMissileParticleFile());
else if (mInfo->getAttack(attackId))
@@ -1720,14 +1725,24 @@ void Being::petLogic()
return;
}
}
- if (mAction == STAND)
+ if (mOwner->getCurrentAction() != ATTACK)
+ {
+ if (mAction == ATTACK)
+ setAction(STAND, 0);
+ }
+ else
+ {
+ if (mAction == STAND || mAction == ATTACK)
+ setAction(ATTACK, 0);
+ }
+
+ if (mAction == STAND || mAction == ATTACK)
{
int directionType = 0;
switch (mOwner->getCurrentAction())
{
case STAND:
case MOVE:
- case ATTACK:
case HURT:
case SPAWN:
default:
@@ -1739,6 +1754,9 @@ void Being::petLogic()
case DEAD:
directionType = mInfo->getDeadDirectionType();
break;
+ case ATTACK:
+ directionType = mInfo->getAttackDirectionType();
+ break;
}
int newDir = 0;
@@ -1773,6 +1791,21 @@ void Being::petLogic()
else if (dstY < dstY0)
newDir |= UP;
break;
+
+ case 4:
+ {
+ const int dstX2 = mOwner->getLastAttackX();
+ const int dstY2 = mOwner->getLastAttackY();
+ if (dstX > dstX2)
+ newDir |= LEFT;
+ else if (dstX < dstX2)
+ newDir |= RIGHT;
+ if (dstY > dstY2)
+ newDir |= UP;
+ else if (dstY < dstY2)
+ newDir |= DOWN;
+ break;
+ }
}
if (newDir && newDir != getDirection())
setDirection(newDir);
@@ -2131,7 +2164,7 @@ void Being::setSprite(const unsigned int slot, const int id,
if (id1)
{
const ItemInfo &info = ItemDB::get(id1);
- if (mMap && mType == PLAYER)
+ if (!isTempSprite && mMap && mType == PLAYER)
{
const int pet = info.getPet();
if (pet)
@@ -2146,7 +2179,7 @@ void Being::setSprite(const unsigned int slot, const int id,
const std::string filename = info.getSprite(mGender, mSubType);
AnimatedSprite *equipmentSprite = nullptr;
- if (mType == PLAYER)
+ if (!isTempSprite && mType == PLAYER)
{
const int pet = info.getPet();
if (pet)
@@ -3337,6 +3370,10 @@ void Being::fixPetSpawnPos(int &dstX, int &dstY) const
break;
case ATTACK:
+ offsetX1 = mInfo->getAttackOffsetX();
+ offsetY1 = mInfo->getAttackOffsetY();
+ break;
+
case SPAWN:
case HURT:
case STAND:
diff --git a/src/being/being.h b/src/being/being.h
index 7314fe1f1..d3dfe2cc1 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -930,6 +930,12 @@ class Being : public ActorSprite, public ConfigListener
int decUsage()
{ return --mUsageCounter; }
+ virtual int getLastAttackX() const
+ { return mLastAttackX; }
+
+ virtual int getLastAttackY() const
+ { return mLastAttackY; }
+
protected:
/**
* Updates name's location.
@@ -996,6 +1002,8 @@ class Being : public ActorSprite, public ConfigListener
int mLevel;
int mAttackRange;
+ int mLastAttackX;
+ int mLastAttackY;
Gender mGender;
Action mAction; /**< Action the being is performing */
uint16_t mSubType; /**< Subtype (graphical view, basically) */
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index 0e6ebe8a4..88a6f6754 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -503,6 +503,12 @@ class LocalPlayer final : public Being,
std::string getGameModifiersString();
+ int getLastAttackX() const override final
+ { return mTarget ? mTarget->getTileX() : mLastAttackX; }
+
+ int getLastAttackY() const override final
+ { return mTarget ? mTarget->getTileY() : mLastAttackY; }
+
protected:
void updateCoords() override final;
diff --git a/src/client.cpp b/src/client.cpp
index 289b4df0b..4d301ccfe 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -226,6 +226,7 @@ Client::Client(const Options &options) :
mRootDir(),
mServerName(),
mOnlineListUrl(),
+ mLogFileName(),
mCurrentServer(),
mGame(nullptr),
mCurrentDialog(nullptr),
@@ -293,9 +294,10 @@ void Client::gameInit()
// Configure logger
if (!mOptions.logFileName.empty())
- logger->setLogFile(mOptions.logFileName);
+ mLogFileName = mOptions.logFileName;
else
- logger->setLogFile(mLocalDataDir + "/manaplus.log");
+ mLogFileName = mLocalDataDir + "/manaplus.log";
+ logger->setLogFile(mLogFileName);
#ifdef USE_FUZZER
Fuzzer::init();
@@ -544,6 +546,7 @@ void Client::initGraphics()
#endif
#endif
+ checkConfigVersion();
#if defined(WIN32) || defined(__APPLE__)
if (config.getBoolValue("centerwindow"))
setEnv("SDL_VIDEO_CENTERED", "1");
@@ -575,7 +578,6 @@ void Client::initGraphics()
runCounters = config.getBoolValue("packetcounters");
applyVSync();
graphicsManager.setVideoMode();
- checkConfigVersion();
getConfigDefaults2(config.getDefaultValues());
applyGrabMode();
applyGamma();
@@ -2301,7 +2303,7 @@ void Client::initScreenshotDir()
else if (mScreenshotDir.empty())
{
mScreenshotDir = decodeBase64String(
- config.getStringValue("screenshotDirectory2"));
+ config.getStringValue("screenshotDirectory3"));
if (mScreenshotDir.empty())
{
#ifdef __ANDROID__
@@ -2328,7 +2330,7 @@ void Client::initScreenshotDir()
configScreenshotSuffix);
}
}
- config.setValue("screenshotDirectory2",
+ config.setValue("screenshotDirectory3",
encodeBase64String(mScreenshotDir));
}
}
@@ -2359,6 +2361,7 @@ void Client::accountLogin(LoginData *const data) const
serverConfig.setValue("remember", remember);
}
+#ifndef ANDROID
void Client::storeSafeParameters() const
{
bool tmpHwaccel;
@@ -2477,6 +2480,7 @@ void Client::storeSafeParameters() const
config.setValue("screenheight", height);
}
}
+#endif
void Client::initTradeFilter() const
{
@@ -2796,25 +2800,30 @@ bool Client::isTmw() const
return false;
}
-void Client::resizeVideo(int width, int height, const bool always)
+void Client::resizeVideo(int actualWidth,
+ int actualHeight,
+ const bool always)
{
// Keep a minimum size. This isn't adhered to by the actual window, but
// it keeps some window positions from getting messed up.
- width = std::max(470, width);
- height = std::max(320, height);
+ actualWidth = std::max(470, actualWidth);
+ actualHeight = std::max(320, actualHeight);
if (!mainGraphics)
return;
- if (!always && mainGraphics->mWidth == width
- && mainGraphics->mHeight == height)
+ if (!always
+ && mainGraphics->mActualWidth == actualWidth
+ && mainGraphics->mActualHeight == actualHeight)
{
return;
}
- touchManager.resize(width, height);
-
- if (mainGraphics->resizeScreen(width, height))
+ if (mainGraphics->resizeScreen(actualWidth, actualHeight))
{
+ const int width = mainGraphics->mWidth;
+ const int height = mainGraphics->mHeight;
+ touchManager.resize(width, height);
+
if (gui)
gui->videoResized();
@@ -2850,8 +2859,8 @@ void Client::resizeVideo(int width, int height, const bool always)
if (gui)
gui->draw();
- config.setValue("screenwidth", width);
- config.setValue("screenheight", height);
+ config.setValue("screenwidth", actualWidth);
+ config.setValue("screenheight", actualHeight);
}
}
@@ -2885,6 +2894,17 @@ void Client::applyKeyRepeat()
#endif
}
+void Client::applyScale()
+{
+ const int scale = config.getIntValue("scale");
+ if (mainGraphics->getScale() == scale)
+ return;
+ mainGraphics->setScale(scale);
+ resizeVideo(mainGraphics->mActualWidth,
+ mainGraphics->mActualHeight,
+ true);
+}
+
void Client::setIsMinimized(const bool n)
{
mIsMinimized = n;
@@ -2958,8 +2978,10 @@ void Client::checkConfigVersion()
Being::NO_NAME_IN_BUBBLE));
}
}
+ if (version < 6)
+ config.setValue("blur", false);
- config.setValue("cfgver", 5);
+ config.setValue("cfgver", 6);
}
Window *Client::openErrorDialog(const std::string &header,
diff --git a/src/client.h b/src/client.h
index c166b438b..92daff44b 100644
--- a/src/client.h
+++ b/src/client.h
@@ -272,6 +272,9 @@ public:
std::string getSupportUrl() const A_WARN_UNUSED
{ return mCurrentServer.supportUrl; }
+ std::string getLogFileName() const A_WARN_UNUSED
+ { return mLogFileName; }
+
bool isKeyboardVisible() const;
void setGuiAlpha(const float n)
@@ -308,7 +311,11 @@ public:
void writePacketLimits(const std::string &packetLimitsName) const;
- void resizeVideo(int width, int height, const bool always = false);
+ void resizeVideo(int actualWidth,
+ int actualHeight,
+ const bool always);
+
+ void applyScale();
bool limitPackets(const int type) A_WARN_UNUSED;
@@ -366,7 +373,9 @@ private:
void accountLogin(LoginData *const data) const;
+#ifndef ANDROID
void storeSafeParameters() const;
+#endif
void backupConfig() const;
@@ -406,6 +415,7 @@ private:
std::string mRootDir;
std::string mServerName;
std::string mOnlineListUrl;
+ std::string mLogFileName;
ServerInfo mCurrentServer;
diff --git a/src/commands.cpp b/src/commands.cpp
index 07e0414d5..04cd84166 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -58,6 +58,7 @@
#include "net/adminhandler.h"
#include "net/beinghandler.h"
#include "net/chathandler.h"
+#include "net/download.h"
#include "net/gamehandler.h"
#include "net/guildhandler.h"
#include "net/net.h"
@@ -96,7 +97,8 @@ extern char **environ;
namespace Commands
{
-static void outString(ChatTab *const tab, const std::string &str,
+static void outString(ChatTab *const tab,
+ const std::string &str,
const std::string &def)
{
if (!tab)
@@ -236,7 +238,7 @@ static void outStringNormal(ChatTab *const tab,
case ChatTab::TAB_WHISPER:
{
const WhisperTab *const whisper
- = static_cast<WhisperTab *const>(tab);
+ = static_cast<const WhisperTab *const>(tab);
tab->chatLog(player_node->getName(), str);
Net::getChatHandler()->privateMessage(whisper->getNick(), str);
break;
@@ -1268,6 +1270,94 @@ impHandler1(talkPet)
Net::getChatHandler()->talk(args, GENERAL_CHANNEL);
}
+
+struct UploadChatInfo
+{
+ UploadChatInfo() :
+ tab(nullptr),
+ upload(nullptr),
+ text(),
+ addStr()
+ { }
+
+ A_DELETE_COPY(UploadChatInfo)
+
+ ChatTab *tab;
+ Net::Download *upload;
+ std::string text;
+ std::string addStr;
+};
+
+static int uploadUpdate(void *ptr,
+ DownloadStatus status,
+ size_t total A_UNUSED,
+ size_t remaining A_UNUSED)
+{
+ if (status == DOWNLOAD_STATUS_IDLE || status == DOWNLOAD_STATUS_STARTING)
+ return 0;
+
+ UploadChatInfo *const info = reinterpret_cast<UploadChatInfo*>(ptr);
+ if (status == DOWNLOAD_STATUS_COMPLETE)
+ {
+ ChatTab *const tab = info->tab;
+ if (chatWindow && (!tab || chatWindow->isTabPresent(tab)))
+ {
+ std::string str = Net::Download::getUploadResponse();
+ const int sz = str.size();
+ if (sz > 0)
+ {
+ if (str[sz - 1] == '\n')
+ str = str.substr(0, sz - 1);
+ str.append(info->addStr);
+ str = strprintf("%s [@@%s |%s@@]",
+ info->text.c_str(), str.c_str(), str.c_str());
+ outStringNormal(tab, str, str);
+ }
+ }
+ }
+ delete info->upload;
+ info->upload = nullptr;
+ delete info;
+ return 0;
+}
+
+static void uploadFile(const std::string &str,
+ const std::string &fileName,
+ const std::string &addStr)
+{
+ UploadChatInfo *const info = new UploadChatInfo();
+ Net::Download *const upload = new Net::Download(info,
+ "http://sprunge.us",
+ &uploadUpdate,
+ false, true);
+ info->upload = upload;
+ info->text = str;
+ info->addStr = addStr;
+ upload->setFile(fileName);
+ upload->start();
+}
+
+impHandler0(uploadConfig)
+{
+ uploadFile(_("Uploaded config into:"),
+ config.getFileName(),
+ "?xml");
+}
+
+impHandler0(uploadServerConfig)
+{
+ uploadFile(_("Uploaded server config into:"),
+ serverConfig.getFileName(),
+ "?xml");
+}
+
+impHandler0(uploadLog)
+{
+ uploadFile(_("Uploaded log into:"),
+ client->getLogFileName(),
+ "?txt");
+}
+
impHandler0(testsdlfont)
{
#if defined USE_OPENGL && defined DEBUG_SDLFONT
@@ -1311,6 +1401,12 @@ impHandler0(testsdlfont)
#endif
}
+impHandler2(dumpMods)
+{
+ std::string str = "enabled mods: " + serverConfig.getValue("mods", "");
+ outStringNormal(tab, str, str);
+}
+
#ifdef USE_OPENGL
impHandler2(dumpGL)
{
diff --git a/src/commands.h b/src/commands.h
index a31dfe292..e53d66559 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -116,6 +116,7 @@ namespace Commands
decHandler(dumpTests);
decHandler(dumpOGL);
decHandler(dumpGL);
+ decHandler(dumpMods);
decHandler(cacheInfo);
decHandler(execute);
decHandler(testsdlfont);
@@ -129,6 +130,9 @@ namespace Commands
decHandler(createItems);
decHandler(talkRaw);
decHandler(talkPet);
+ decHandler(uploadConfig);
+ decHandler(uploadServerConfig);
+ decHandler(uploadLog);
void replaceVars(std::string &str);
} // namespace Commands
@@ -205,6 +209,7 @@ enum
COMMAND_DUMPT,
COMMAND_DUMPOGL,
COMMAND_DUMPGL,
+ COMMAND_DUMPMODS,
COMMAND_URL,
COMMAND_OPEN,
COMMAND_EXECUTE,
@@ -225,6 +230,9 @@ enum
COMMAND_CREATEITEMS,
COMMAND_TALKRAW,
COMMAND_TALKPET,
+ COMMAND_UPLOADCONFIG,
+ COMMAND_UPLOADSERVERCONFIG,
+ COMMAND_UPLOADLOG,
COMMAND_HACK,
END_COMMANDS
};
@@ -301,6 +309,7 @@ static const CommandInfo commands[] =
{"dumpt", &Commands::dumpTests, -1, false},
{"dumpogl", &Commands::dumpOGL, -1, false},
{"dumpgl", &Commands::dumpGL, -1, false},
+ {"dumpmods", &Commands::dumpMods, -1, false},
{"url", &Commands::url, -1, true},
{"open", &Commands::open, -1, true},
{"execute", &Commands::execute, -1, true},
@@ -321,6 +330,9 @@ static const CommandInfo commands[] =
{"createitems", &Commands::createItems, -1, false},
{"talkraw", &Commands::talkRaw, -1, true},
{"talkpet", &Commands::talkPet, -1, true},
+ {"uploadconfig", &Commands::uploadConfig, -1, false},
+ {"uploadserverconfig", &Commands::uploadServerConfig, -1, false},
+ {"uploadlog", &Commands::uploadLog, -1, false},
{"hack", &Commands::hack, -1, true}
};
diff --git a/src/configuration.cpp b/src/configuration.cpp
index ca4542155..d4b9f122b 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -202,6 +202,8 @@ const std::string unusedKeys[] =
"OutfitAwayIndex",
"playerHomes",
"remember",
+ "screenshotDirectory",
+ "screenshotDirectory2",
""
};
diff --git a/src/configuration.h b/src/configuration.h
index 322d4c934..daa10f51b 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -343,6 +343,9 @@ class Configuration final : public ConfigurationObject
void removeOldKeys();
+ std::string getFileName() const A_WARN_UNUSED
+ { return mFilename; }
+
private:
/**
* Clean up the default values member.
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 9362473fd..c343f9f11 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -152,7 +152,7 @@ DefaultsData* getConfigDefaults()
AddDEF("lastCharacter", "");
AddDEF("altfpslimit", 5);
AddDEF("updatehost", "");
- AddDEF("screenshotDirectory2", "");
+ AddDEF("screenshotDirectory3", "");
AddDEF("useScreenshotDirectorySuffix", true);
AddDEF("screenshotDirectorySuffix", "");
AddDEF("EnableSync", false);
@@ -345,7 +345,7 @@ DefaultsData* getConfigDefaults()
AddDEF("uselonglivesprites", false);
AddDEF("uselonglivesounds", true);
AddDEF("screenDensity", 0);
- AddDEF("cfgver", 4);
+ AddDEF("cfgver", 6);
AddDEF("enableDebugLog", false);
AddDEF("doubleClick", true);
AddDEF("useDiagonalSpeed", true);
@@ -356,6 +356,7 @@ DefaultsData* getConfigDefaults()
AddDEF("showmotd", false);
AddDEF("playMapAnimations", true);
AddDEF("usepets", true);
+ AddDEF("scale", 1);
return configData;
}
diff --git a/src/eventsmanager.cpp b/src/eventsmanager.cpp
index 6c102bdc1..237e7bf68 100644
--- a/src/eventsmanager.cpp
+++ b/src/eventsmanager.cpp
@@ -77,7 +77,7 @@ bool EventsManager::handleCommonEvents(const SDL_Event &event)
return true;
#else
case SDL_VIDEORESIZE:
- client->resizeVideo(event.resize.w, event.resize.h);
+ client->resizeVideo(event.resize.w, event.resize.h, false);
return true;
case SDL_ACTIVEEVENT:
handleActive(event);
diff --git a/src/game.cpp b/src/game.cpp
index 91a9038c8..6e4341372 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -524,7 +524,6 @@ bool Game::saveScreenshot(SDL_Surface *const screenshot)
}
// Search for an unused screenshot name
- std::stringstream filenameSuffix;
std::stringstream filename;
std::fstream testExists;
bool found = false;
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index 552f5a018..00cceb22f 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -376,9 +376,10 @@ void GraphicsManager::setVideoMode()
int width = config.getIntValue("screenwidth");
int height = config.getIntValue("screenheight");
#endif
+ const int scale = config.getIntValue("scale");
// Try to set the desired video mode
- if (!mainGraphics->setVideoMode(width, height, bpp,
+ if (!mainGraphics->setVideoMode(width, height, scale, bpp,
fullscreen, hwaccel, enableResize, noFrame))
{
logger->log(strprintf("Couldn't set %dx%dx%d video mode: %s",
@@ -396,7 +397,7 @@ void GraphicsManager::setVideoMode()
config.setValueInt("screenwidth", oldWidth);
config.setValueInt("screenheight", oldHeight);
config.setValue("screen", oldFullscreen == 1);
- if (!mainGraphics->setVideoMode(oldWidth, oldHeight, bpp,
+ if (!mainGraphics->setVideoMode(oldWidth, oldHeight, scale, bpp,
oldFullscreen, hwaccel, enableResize, noFrame))
{
logger->safeError(strprintf("Couldn't restore %dx%dx%d "
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index a8c31469a..dcd4d82ea 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -494,7 +494,7 @@ void Gui::draw()
touchManager.draw();
int mouseX, mouseY;
- const uint8_t button = SDL_GetMouseState(&mouseX, &mouseY);
+ const uint8_t button = getMouseState(&mouseX, &mouseY);
if ((client->getMouseFocused() || button & SDL_BUTTON(1))
&& mMouseCursors && mCustomCursor && mMouseCursorAlpha > 0.0F)
@@ -787,7 +787,7 @@ MouseEvent *Gui::createMouseEvent(Window *const widget)
int mouseY = 0;
getAbsolutePosition(widget, x, y);
- SDL_GetMouseState(&mouseX, &mouseY);
+ getMouseState(&mouseX, &mouseY);
return new MouseEvent(widget, mShiftPressed,
mControlPressed, mAltPressed, mMetaPressed, 0, 0,
@@ -939,3 +939,12 @@ void Gui::removeDragged(gcn::Widget *widget)
if (mFocusHandler->getDraggedWidget() == widget)
mFocusHandler->setDraggedWidget(nullptr);
}
+
+uint32_t Gui::getMouseState(int *const x, int *const y) const
+{
+ const uint32_t res = SDL_GetMouseState(x, y);
+ const int scale = mainGraphics->getScale();
+ (*x) /= scale;
+ (*y) /= scale;
+ return res;
+}
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 7c34fc5cf..033a71282 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -164,6 +164,8 @@ class Gui final : public gcn::Gui
int getLastMouseY() const
{ return mLastMouseY; }
+ uint32_t getMouseState(int *const x, int *const y) const;
+
protected:
void handleMouseMoved(const gcn::MouseInput &mouseInput);
diff --git a/src/gui/sdlinput.cpp b/src/gui/sdlinput.cpp
index 19b37a7d6..193a35dfe 100644
--- a/src/gui/sdlinput.cpp
+++ b/src/gui/sdlinput.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,13 +26,12 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson
+ * Copyright (c) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson
* Copyright (C) 2007-2010 The Mana World Development Team
- * Copyright (C) 2011-2014 The ManaPlus Developers
*
* Js_./
* Per Larsson a.k.a finalman _RqZ{a<^_aa
- * Olof Naessén a.k.a jansem/yakslem _asww7!uY`> )\a//
+ * Olof Naessén a.k.a jansem/yakslem _asww7!uY`> )\a//
* _Qhm`] _f "'c 1!5m
* Visit: http://guichan.darkbits.org )Qk<P ` _: :+' .' "{[
* .)j(] .d_/ '-( P . S
@@ -62,6 +81,8 @@
#include "input/inputmanager.h"
+#include "render/graphics.h"
+
#ifdef USE_SDL2
#include "gui/gui.h"
#endif
@@ -191,14 +212,19 @@ void SDLInput::pushInput(const SDL_Event &event)
#endif
case SDL_MOUSEBUTTONDOWN:
+ {
mMouseDown = true;
- mouseInput.setX(event.button.x);
- mouseInput.setY(event.button.y);
+ const int scale = mainGraphics->getScale();
+ const int x = event.button.x / scale;
+ const int y = event.button.y / scale;
+ mouseInput.setX(x);
+ mouseInput.setY(y);
#ifdef ANDROID
#ifdef USE_SDL2
- mouseInput.setReal(event.button.x, event.button.y);
+ mouseInput.setReal(x, y);
#else
- mouseInput.setReal(event.button.realx, event.button.realy);
+ mouseInput.setReal(event.button.realx / scale,
+ event.button.realy / scale);
#endif
#endif
mouseInput.setButton(convertMouseButton(event.button.button));
@@ -214,16 +240,21 @@ void SDLInput::pushInput(const SDL_Event &event)
mouseInput.setTimeStamp(SDL_GetTicks());
mMouseInputQueue.push(mouseInput);
break;
-
+ }
case SDL_MOUSEBUTTONUP:
+ {
mMouseDown = false;
- mouseInput.setX(event.button.x);
- mouseInput.setY(event.button.y);
+ const int scale = mainGraphics->getScale();
+ const int x = event.button.x / scale;
+ const int y = event.button.y / scale;
+ mouseInput.setX(x);
+ mouseInput.setY(y);
#ifdef ANDROID
#ifdef USE_SDL2
- mouseInput.setReal(event.button.x, event.button.y);
+ mouseInput.setReal(x, y);
#else
- mouseInput.setReal(event.button.realx, event.button.realy);
+ mouseInput.setReal(event.button.realx / scale,
+ event.button.realy / scale);
#endif
#endif
mouseInput.setButton(convertMouseButton(event.button.button));
@@ -231,15 +262,20 @@ void SDLInput::pushInput(const SDL_Event &event)
mouseInput.setTimeStamp(SDL_GetTicks());
mMouseInputQueue.push(mouseInput);
break;
-
+ }
case SDL_MOUSEMOTION:
- mouseInput.setX(event.motion.x);
- mouseInput.setY(event.motion.y);
+ {
+ const int scale = mainGraphics->getScale();
+ const int x = event.motion.x / scale;
+ const int y = event.motion.y / scale;
+ mouseInput.setX(x);
+ mouseInput.setY(y);
#ifdef ANDROID
#ifdef USE_SDL2
- mouseInput.setReal(event.motion.x, event.motion.y);
+ mouseInput.setReal(x, y);
#else
- mouseInput.setReal(event.motion.realx, event.motion.realy);
+ mouseInput.setReal(event.motion.realx / scale,
+ event.motion.realy / scale);
#endif
#endif
mouseInput.setButton(gcn::MouseInput::EMPTY);
@@ -247,7 +283,7 @@ void SDLInput::pushInput(const SDL_Event &event)
mouseInput.setTimeStamp(SDL_GetTicks());
mMouseInputQueue.push(mouseInput);
break;
-
+ }
#ifndef USE_SDL2
case SDL_ACTIVEEVENT:
/*
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index a957ffa86..b07a57a00 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,13 +26,12 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson
+ * Copyright (c) 2004, 2005, 2006, 2007 Olof Naessén and Per Larsson
* Copyright (C) 2007-2010 The Mana World Development Team
- * Copyright (C) 2011-2014 The ManaPlus Developers
*
* Js_./
* Per Larsson a.k.a finalman _RqZ{a<^_aa
- * Olof Naessén a.k.a jansem/yakslem _asww7!uY`> )\a//
+ * Olof Naessén a.k.a jansem/yakslem _asww7!uY`> )\a//
* _Qhm`] _f "'c 1!5m
* Visit: http://guichan.darkbits.org )Qk<P ` _: :+' .' "{[
* .)j(] .d_/ '-( P . S
diff --git a/src/gui/setupactiondata.h b/src/gui/setupactiondata.h
index b80052b30..2b9d694a8 100644
--- a/src/gui/setupactiondata.h
+++ b/src/gui/setupactiondata.h
@@ -96,7 +96,7 @@ static SetupActionData setupActionData0[] =
},
{
// TRANSLATORS: input action name
- N_("Stop Attack"),
+ N_("Stop Attack / Modifier key"),
Input::KEY_STOP_ATTACK,
"",
},
@@ -1368,12 +1368,6 @@ static SetupActionData setupActionData6[] =
},
{
// TRANSLATORS: input action name
- N_("Modifier key"),
- Input::KEY_MOD,
- "",
- },
- {
- // TRANSLATORS: input action name
N_("Show onscreen keyboard"),
Input::KEY_SHOW_KEYBOARD,
"",
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 933c00040..5206b7424 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -275,7 +275,9 @@ void Viewport::logic()
void Viewport::_followMouse()
{
- const uint8_t button = SDL_GetMouseState(&mMouseX, &mMouseY);
+ if (!gui)
+ return;
+ const uint8_t button = gui->getMouseState(&mMouseX, &mMouseY);
// If the left button is dragged
if (mPlayerFollowMouse && (button & SDL_BUTTON(1)))
{
@@ -297,10 +299,10 @@ void Viewport::_followMouse()
void Viewport::_drawDebugPath(Graphics *const graphics)
{
- if (!player_node || !userPalette || !actorManager || !mMap)
+ if (!player_node || !userPalette || !actorManager || !mMap || !gui)
return;
- SDL_GetMouseState(&mMouseX, &mMouseY);
+ gui->getMouseState(&mMouseX, &mMouseY);
static Path debugPath;
static Vector lastMouseDestination = Vector(0.0F, 0.0F);
diff --git a/src/gui/widgets/characterdisplay.cpp b/src/gui/widgets/characterdisplay.cpp
index 52f56ae69..bd3f042f9 100644
--- a/src/gui/widgets/characterdisplay.cpp
+++ b/src/gui/widgets/characterdisplay.cpp
@@ -122,9 +122,12 @@ void CharacterDisplay::mouseExited(gcn::MouseEvent &event A_UNUSED)
void CharacterDisplay::mouseMoved(gcn::MouseEvent &event A_UNUSED)
{
+ if (!gui)
+ return;
+
int mouseX = 0;
int mouseY = 0;
- SDL_GetMouseState(&mouseX, &mouseY);
+ gui->getMouseState(&mouseX, &mouseY);
const std::string &name = mName->getCaption();
if (!name.empty())
{
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index fa413452f..d080a6072 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -220,8 +220,9 @@ void EmoteShortcutContainer::mouseMoved(gcn::MouseEvent &event)
if (static_cast<unsigned>(index) < mEmoteImg.size() && mEmoteImg[index])
{
+ const EmoteSprite *const sprite = mEmoteImg[index];
mEmotePopup->show(viewport->getMouseX(), viewport->getMouseY(),
- mEmoteImg[index]->name);
+ strprintf("%s, %d", sprite->name.c_str(), sprite->id));
}
}
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index 6ce8ce102..b9ea91f76 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -326,6 +326,30 @@ void SetupItemTextField::save()
}
}
+void SetupItemTextField::cancel(const std::string &eventName A_UNUSED)
+{
+ load();
+ if (mUseBase64)
+ mValue = decodeBase64String(mValue);
+ toWidget();
+}
+
+void SetupItemTextField::externalUpdated(const std::string &eventName A_UNUSED)
+{
+ load();
+ if (mUseBase64)
+ mValue = decodeBase64String(mValue);
+ toWidget();
+}
+
+void SetupItemTextField::rereadValue()
+{
+ load();
+ if (mUseBase64)
+ mValue = decodeBase64String(mValue);
+ toWidget();
+}
+
void SetupItemTextField::createControls()
{
load();
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index 91547733f..689f62fdf 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -96,7 +96,7 @@ class SetupItem : public gcn::ActionListener,
void fixFirstItemSize(gcn::Widget *const widget);
- void rereadValue();
+ virtual void rereadValue();
void setValue(const std::string str)
{ mValue = str; }
@@ -214,6 +214,13 @@ class SetupItemTextField final : public SetupItem
void apply(const std::string &eventName) override final;
+ void cancel(const std::string &eventName A_UNUSED) override final;
+
+ void externalUpdated(const std::string &eventName A_UNUSED)
+ override final;
+
+ void rereadValue() override final;
+
void save() override final;
void setUseBase64(const bool b)
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 70e098cd3..da6c89d1a 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -236,6 +236,16 @@ bool TabbedArea::isTabSelected(const unsigned int index) const
return mSelectedTab == mTabs[index].first;
}
+bool TabbedArea::isTabPresent(const Tab *const tab) const
+{
+ FOR_EACH (TabContainer::const_iterator, it, mTabs)
+ {
+ if ((*it).first == tab || (*it).second == tab)
+ return true;
+ }
+ return false;
+}
+
bool TabbedArea::isTabSelected(const Tab *const tab) const
{
return mSelectedTab == tab;
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 37950e204..eaac7a6d5 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -104,6 +104,8 @@ class TabbedArea final : public Widget2,
bool isTabSelected(const Tab *const tab) const A_WARN_UNUSED;
+ bool isTabPresent(const Tab *const tab) const A_WARN_UNUSED;
+
/**
* Overload the remove tab function as it's broken in guichan 0.8.
*/
@@ -206,7 +208,7 @@ class TabbedArea final : public Widget2,
gcn::Container* mTabContainer;
gcn::Container* mWidgetContainer;
std::vector<Tab*> mTabsToDelete;
- std::vector<std::pair<Tab*, gcn::Widget*> > mTabs;
+ TabContainer mTabs;
/**
* The overall width of all tab.
diff --git a/src/gui/widgets/tabs/setup_other.cpp b/src/gui/widgets/tabs/setup_other.cpp
index 9f3c30dec..985baa744 100644
--- a/src/gui/widgets/tabs/setup_other.cpp
+++ b/src/gui/widgets/tabs/setup_other.cpp
@@ -374,7 +374,7 @@ Setup_Other::Setup_Other(const Widget2 *const widget) :
#ifndef WIN32
// TRANSLATORS: settings option
new SetupItemTextField(_("Screenshot directory"), "",
- "screenshotDirectory2", this, "screenshotDirectory2Event", true, true);
+ "screenshotDirectory3", this, "screenshotDirectory3Event", true, true);
#endif
// TRANSLATORS: settings option
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index feebb774a..45ada01df 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -84,7 +84,9 @@ class ModeListModel final : public gcn::ListModel
int getIndexOf(const std::string &widthXHeightMode);
private:
+#ifndef ANDROID
void addCustomMode(const std::string &mode);
+#endif
StringVect mVideoModes;
};
@@ -122,14 +124,15 @@ ModeListModel::ModeListModel() :
addCustomMode("1280x1024");
addCustomMode("1400x900");
addCustomMode("1500x990");
- addCustomMode(toString(mainGraphics->mWidth).append("x")
- .append(toString(mainGraphics->mHeight)));
+ addCustomMode(toString(mainGraphics->mActualWidth).append("x")
+ .append(toString(mainGraphics->mActualHeight)));
std::sort(mVideoModes.begin(), mVideoModes.end(), &modeSorter);
mVideoModes.push_back("custom");
#endif
}
+#ifndef ANDROID
void ModeListModel::addCustomMode(const std::string &mode)
{
StringVectCIter it = mVideoModes.begin();
@@ -142,6 +145,7 @@ void ModeListModel::addCustomMode(const std::string &mode)
}
mVideoModes.push_back(mode);
}
+#endif
int ModeListModel::getIndexOf(const std::string &widthXHeightMode)
{
@@ -243,8 +247,9 @@ Setup_Video::Setup_Video(const Widget2 *const widget) :
mFpsCheckBox->setSelected(mFps > 0);
// Pre-select the current video mode.
- const std::string videoMode = toString(mainGraphics->mWidth).append("x")
- .append(toString(mainGraphics->mHeight));
+ const std::string videoMode = toString(
+ mainGraphics->mActualWidth).append("x").append(
+ toString(mainGraphics->mActualHeight));
mModeList->setSelected(mModeListModel->getIndexOf(videoMode));
mModeList->setActionEventId("videomode");
@@ -428,11 +433,11 @@ void Setup_Video::cancel()
config.setValue("screen", mFullScreenEnabled);
// Set back to the current video mode.
- std::string videoMode = toString(mainGraphics->mWidth).append("x")
- .append(toString(mainGraphics->mHeight));
+ std::string videoMode = toString(mainGraphics->mActualWidth).append("x")
+ .append(toString(mainGraphics->mActualHeight));
mModeList->setSelected(mModeListModel->getIndexOf(videoMode));
- config.setValue("screenwidth", mainGraphics->mWidth);
- config.setValue("screenheight", mainGraphics->mHeight);
+ config.setValue("screenwidth", mainGraphics->mActualWidth);
+ config.setValue("screenheight", mainGraphics->mActualHeight);
config.setValue("customcursor", mCustomCursorEnabled);
config.setValue("opengl", static_cast<int>(mOpenGLEnabled));
@@ -474,18 +479,19 @@ void Setup_Video::action(const gcn::ActionEvent &event)
if (!width || !height)
return;
- if (width != mainGraphics->mWidth || height != mainGraphics->mHeight)
+ if (width != mainGraphics->mActualWidth
+ || height != mainGraphics->mActualHeight)
{
#if defined(WIN32) || defined(__APPLE__) || defined(ANDROID)
if (intToRenderType(config.getIntValue("opengl"))
== RENDER_SOFTWARE)
{
- client->resizeVideo(width, height);
+ client->resizeVideo(width, height, false);
}
else
{
- if (width < mainGraphics->mWidth
- || height < mainGraphics->mHeight)
+ if (width < mainGraphics->mActualWidth
+ || height < mainGraphics->mActualHeight)
{
// TRANSLATORS: video settings warning
new OkDialog(_("Screen Resolution Changed"),
@@ -505,13 +511,13 @@ void Setup_Video::action(const gcn::ActionEvent &event)
}
#else
mainGraphics->setWindowSize(width, height);
- client->resizeVideo(width, height);
+ client->resizeVideo(width, height, false);
#endif
}
config.setValue("oldscreen", config.getBoolValue("screen"));
- config.setValue("oldscreenwidth", mainGraphics->mWidth);
- config.setValue("oldscreenheight", mainGraphics->mHeight);
+ config.setValue("oldscreenwidth", mainGraphics->mActualWidth);
+ config.setValue("oldscreenheight", mainGraphics->mActualHeight);
config.setValue("screenwidth", width);
config.setValue("screenheight", height);
}
diff --git a/src/gui/widgets/tabs/setup_visual.cpp b/src/gui/widgets/tabs/setup_visual.cpp
index 7e565a291..8d79fdaa0 100644
--- a/src/gui/widgets/tabs/setup_visual.cpp
+++ b/src/gui/widgets/tabs/setup_visual.cpp
@@ -87,7 +87,8 @@ Setup_Visual::Setup_Visual(const Widget2 *const widget) :
mAmbientFxList(new NamesModel),
mParticleList(new SetupItemNames),
mParticleTypeList(new NamesModel),
- mVSyncList(new NamesModel)
+ mVSyncList(new NamesModel),
+ mScaleList(new SetupItemNames)
{
// TRANSLATORS: settings tab name
setName(_("Visual"));
@@ -99,6 +100,18 @@ Setup_Visual::Setup_Visual(const Widget2 *const widget) :
mPreferredFirstItemSize = 150;
// TRANSLATORS: settings option
+ new SetupItemLabel(_("Scale"), "", this);
+
+ for (int f = 1; f <= 7; f ++)
+ {
+ // TRANSLATORS: particle details
+ mScaleList->push_back(toString(f) + "x");
+ }
+ new SetupItemSlider2(_("Scale "), "", "scale",
+ this, "scaleEvent", 1, 7,
+ mScaleList, true);
+
+ // TRANSLATORS: settings option
new SetupItemLabel(_("Notifications"), "", this);
// TRANSLATORS: settings option
@@ -204,10 +217,15 @@ Setup_Visual::~Setup_Visual()
mParticleTypeList = nullptr;
delete mVSyncList;
mVSyncList = nullptr;
+ delete mScaleList;
+ mScaleList = nullptr;
}
void Setup_Visual::apply()
{
SetupTabScroll::apply();
Client::applyGrabMode();
+#ifndef WIN32
+ client->applyScale();
+#endif
}
diff --git a/src/gui/widgets/tabs/setup_visual.h b/src/gui/widgets/tabs/setup_visual.h
index 3967fd1de..8aef0d294 100644
--- a/src/gui/widgets/tabs/setup_visual.h
+++ b/src/gui/widgets/tabs/setup_visual.h
@@ -43,6 +43,7 @@ class Setup_Visual final : public SetupTabScroll
SetupItemNames *mParticleList;
NamesModel *mParticleTypeList;
NamesModel *mVSyncList;
+ SetupItemNames *mScaleList;
};
#endif // GUI_WIDGETS_TABS_SETUP_VISUAL_H
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 07fde23cd..41084c867 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -741,10 +741,13 @@ void TextField::mousePressed(gcn::MouseEvent &mouseEvent)
mPopupMenu = new PopupMenu();
mPopupMenu->postInit();
}
- int x = 0;
- int y = 0;
- SDL_GetMouseState(&x, &y);
- mPopupMenu->showTextFieldPopup(x, y, this);
+ if (gui)
+ {
+ int x = 0;
+ int y = 0;
+ gui->getMouseState(&x, &y);
+ mPopupMenu->showTextFieldPopup(x, y, this);
+ }
}
}
else
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index e1afb6e5b..6af18ff06 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -1481,53 +1481,59 @@ bool ChatWindow::resortChatLog(std::string line, Own own,
if (!channel.empty())
prefix = std::string("##3").append(channel).append("##0");
- if (tradeChatTab)
+ if (findI(line, mTradeFilter) != std::string::npos)
{
- if (findI(line, mTradeFilter) != std::string::npos)
+ if (tradeChatTab)
{
tradeChatTab->chatLog(prefix + line, own,
ignoreRecord, tryRemoveColors);
- return false;
}
+ return false;
+ }
- size_t idx2 = line.find(": ");
- if (idx2 != std::string::npos)
+ size_t idx2 = line.find(": ");
+ if (idx2 != std::string::npos)
+ {
+ const size_t idx = line.find(": \302\202");
+ if (idx == idx2)
{
- const size_t idx = line.find(": \302\202");
- if (idx == idx2)
+ if (line.find(": \302\202\302") != std::string::npos)
{
- if (line.find(": \302\202\302") != std::string::npos)
+ if (line.find(": \302\202\302e") != std::string::npos)
{
- if (line.find(": \302\202\302e") != std::string::npos)
- {
- const std::string nick = line.substr(0, idx2 - 1);
- line = line.substr(idx2 + 6);
- localPetEmote(nick, atoi(line.c_str()));
- }
- // ignore other special message formats.
- return false;
+ const std::string nick = line.substr(0, idx2 - 1);
+ line = line.substr(idx2 + 6);
+ localPetEmote(nick, atoi(line.c_str()));
}
+ // ignore other special message formats.
+ return false;
+ }
- // pet talk message detected
- if (line.find(": \302\202\303 ") != std::string::npos)
+ // pet talk message detected
+ if (line.find(": \302\202\303 ") != std::string::npos)
+ {
+ if (actorManager && idx2 > 1)
{
- if (actorManager && idx2 > 1)
- {
- const std::string nick = line.substr(0, idx2 - 1);
- line = line.substr(idx2 + 6);
- localPetSay(nick, line);
- }
-
- return false;
+ const std::string nick = line.substr(0, idx2 - 1);
+ line = line.substr(idx2 + 6);
+ localPetSay(nick, line);
}
+ return false;
+ }
+
+ if (tradeChatTab)
+ {
line = line.erase(idx + 2, 2);
tradeChatTab->chatLog(prefix + line, own, ignoreRecord,
tryRemoveColors);
- return false;
}
+ return false;
}
+ }
+ if (tradeChatTab)
+ {
const size_t idx1 = line.find("@@");
if (idx1 != std::string::npos)
{
@@ -1905,11 +1911,14 @@ void ChatWindow::draw(gcn::Graphics* graphics)
void ChatWindow::updateVisibility()
{
+ if (!gui)
+ return;
+
int mouseX = 0;
int mouseY = 0;
int x = 0;
int y = 0;
- SDL_GetMouseState(&mouseX, &mouseY);
+ gui->getMouseState(&mouseX, &mouseY);
getAbsolutePosition(x, y);
if (mChatInput->isVisible())
{
@@ -1943,3 +1952,8 @@ void ChatWindow::addGlobalMessage(const std::string &line)
else
localChatTab->chatLog(line, BY_GM);
}
+
+bool ChatWindow::isTabPresent(const ChatTab *const tab) const
+{
+ return mChatTabs->isTabPresent(tab);
+}
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index 014eceb5a..c000215f1 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -292,6 +292,8 @@ class ChatWindow final : public Window,
void postInit() override final;
+ bool isTabPresent(const ChatTab *const tab) const A_WARN_UNUSED;
+
static void localPetSay(const std::string &nick,
const std::string &text);
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index f521f4b9b..621f5e537 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -48,8 +48,6 @@
#include <guichan/font.hpp>
-#include <SDL_mouse.h>
-
#include "debug.h"
static const int BOX_COUNT = 13;
@@ -425,9 +423,6 @@ void EquipmentWindow::mouseMoved(gcn::MouseEvent &event)
if (item)
{
- int mouseX, mouseY;
- SDL_GetMouseState(&mouseX, &mouseY);
-
mItemPopup->setItem(item);
mItemPopup->position(x + getX(), y + getY());
}
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index da91b84be..02b30aed7 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -425,7 +425,8 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
if (PlayerInfo::isItemProtected(item->getId()))
return;
- if (inputManager.isActionActive(static_cast<int>(Input::KEY_MOD)))
+ if (inputManager.isActionActive(static_cast<int>(
+ Input::KEY_STOP_ATTACK)))
{
PlayerInfo::dropItem(item, item->getQuantity(), true);
}
@@ -474,10 +475,11 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
gui->resetClickCount();
const bool mod = (isStorageActive() && inputManager.isActionActive(
- static_cast<int>(Input::KEY_MOD)));
+ static_cast<int>(Input::KEY_STOP_ATTACK)));
const bool mod2 = (tradeWindow && tradeWindow->isWindowVisible()
- && inputManager.isActionActive(static_cast<int>(Input::KEY_MOD)));
+ && inputManager.isActionActive(static_cast<int>(
+ Input::KEY_STOP_ATTACK)));
if (!mod && !mod2 && event.getButton() == gcn::MouseEvent::RIGHT)
{
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 2a1ec8314..3006922c3 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -573,7 +573,8 @@ void ServerDialog::downloadServerList()
mDownload = nullptr;
}
- mDownload = new Net::Download(this, listFile, &downloadUpdate);
+ mDownload = new Net::Download(this, listFile,
+ &downloadUpdate, false, false);
mDownload->setFile(std::string(mDir).append("/").append(
branding.getStringValue("onlineServerFile")));
mDownload->start();
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 584f8e90e..eab1bea1b 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -523,12 +523,12 @@ void UpdaterWindow::download()
{
mDownload = new Net::Download(this,
"http://manaplus.org/update/" + mCurrentFile,
- &updateProgress, true);
+ &updateProgress, true, false);
}
else
{
mDownload = new Net::Download(this, std::string(mUpdateHost).append(
- "/").append(mCurrentFile), &updateProgress);
+ "/").append(mCurrentFile), &updateProgress, false, false);
}
if (mStoreInMemory)
diff --git a/src/guichan/actionevent.cpp b/src/guichan/actionevent.cpp
index 66e9c4529..2a31bfc8b 100644
--- a/src/guichan/actionevent.cpp
+++ b/src/guichan/actionevent.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/basiccontainer.cpp b/src/guichan/basiccontainer.cpp
index 9fc57672f..239a8544e 100644
--- a/src/guichan/basiccontainer.cpp
+++ b/src/guichan/basiccontainer.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/cliprectangle.cpp b/src/guichan/cliprectangle.cpp
index 666782eb3..c09990087 100644
--- a/src/guichan/cliprectangle.cpp
+++ b/src/guichan/cliprectangle.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/color.cpp b/src/guichan/color.cpp
index cda98c8e2..27612876f 100644
--- a/src/guichan/color.cpp
+++ b/src/guichan/color.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/event.cpp b/src/guichan/event.cpp
index e25c8cce1..f4a03bc19 100644
--- a/src/guichan/event.cpp
+++ b/src/guichan/event.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/exception.cpp b/src/guichan/exception.cpp
index 9d233c935..b02df93eb 100644
--- a/src/guichan/exception.cpp
+++ b/src/guichan/exception.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/focushandler.cpp b/src/guichan/focushandler.cpp
index 10a0ff542..3249703a3 100644
--- a/src/guichan/focushandler.cpp
+++ b/src/guichan/focushandler.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/font.cpp b/src/guichan/font.cpp
index 72c378344..982e1ac8c 100644
--- a/src/guichan/font.cpp
+++ b/src/guichan/font.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/graphics.cpp b/src/guichan/graphics.cpp
index 26098ecb5..b63c4b58c 100644
--- a/src/guichan/graphics.cpp
+++ b/src/guichan/graphics.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/gui.cpp b/src/guichan/gui.cpp
index 57d149b8b..fa50812de 100644
--- a/src/guichan/gui.cpp
+++ b/src/guichan/gui.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/image.cpp b/src/guichan/image.cpp
index 26764630f..d60df27a7 100644
--- a/src/guichan/image.cpp
+++ b/src/guichan/image.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/include/guichan/actionevent.hpp b/src/guichan/include/guichan/actionevent.hpp
index 02ef089b6..b0f75a039 100644
--- a/src/guichan/include/guichan/actionevent.hpp
+++ b/src/guichan/include/guichan/actionevent.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -46,7 +65,6 @@
#define GCN_ACTIONEVENT_HPP
#include "guichan/event.hpp"
-#include "guichan/platform.hpp"
#include <string>
@@ -75,10 +93,10 @@ namespace gcn
*
* @see Widget::addActionListener, Widget::removeActionListener,
* Widget::distributeActionEvent
- * @author Olof Naessén
+ * @author Olof Naessén
* @since 0.6.0
*/
- class GCN_CORE_DECLSPEC ActionEvent final : public Event
+ class ActionEvent final : public Event
{
public:
/**
diff --git a/src/guichan/include/guichan/actionlistener.hpp b/src/guichan/include/guichan/actionlistener.hpp
index 7d8ff33a8..0f017873b 100644
--- a/src/guichan/include/guichan/actionlistener.hpp
+++ b/src/guichan/include/guichan/actionlistener.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -48,7 +67,6 @@
#include <string>
#include "guichan/actionevent.hpp"
-#include "guichan/platform.hpp"
namespace gcn
{
@@ -57,10 +75,10 @@ namespace gcn
*
* @see Widget::addActionListener, Widget::removeActionListener,
* ActionEvent
- * @author Olof Naessén
+ * @author Olof Naessén
* @author Per Larsson
*/
- class GCN_CORE_DECLSPEC ActionListener
+ class ActionListener
{
public:
/**
diff --git a/src/guichan/include/guichan/basiccontainer.hpp b/src/guichan/include/guichan/basiccontainer.hpp
index a17b7314c..a3fb18528 100644
--- a/src/guichan/include/guichan/basiccontainer.hpp
+++ b/src/guichan/include/guichan/basiccontainer.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -49,7 +68,6 @@
#include <vector>
#include "guichan/deathlistener.hpp"
-#include "guichan/platform.hpp"
#include "guichan/widget.hpp"
namespace gcn
@@ -62,8 +80,8 @@ namespace gcn
* @see Container
* @since 0.6.0
*/
- class GCN_CORE_DECLSPEC BasicContainer : public Widget,
- public DeathListener
+ class BasicContainer : public Widget,
+ public DeathListener
{
public:
BasicContainer() :
diff --git a/src/guichan/include/guichan/cliprectangle.hpp b/src/guichan/include/guichan/cliprectangle.hpp
index bda344897..148a73d5a 100644
--- a/src/guichan/include/guichan/cliprectangle.hpp
+++ b/src/guichan/include/guichan/cliprectangle.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -46,7 +65,6 @@
#define GCN_CLIPRECTANGLE_HPP
#include "guichan/rectangle.hpp"
-#include "guichan/platform.hpp"
#include "localconsts.h"
@@ -58,7 +76,7 @@ namespace gcn
* offsets. The offsets are used for calculations from relative
* screen coordinates to actual screen coordinates.
*/
- class GCN_CORE_DECLSPEC ClipRectangle final : public Rectangle
+ class ClipRectangle final : public Rectangle
{
public:
/**
diff --git a/src/guichan/include/guichan/color.hpp b/src/guichan/include/guichan/color.hpp
index 56d72a387..c32adb2e9 100644
--- a/src/guichan/include/guichan/color.hpp
+++ b/src/guichan/include/guichan/color.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -45,8 +64,6 @@
#ifndef GCN_COLOR_HPP
#define GCN_COLOR_HPP
-#include "guichan/platform.hpp"
-
#include <iostream>
#include "localconsts.h"
@@ -56,7 +73,7 @@ namespace gcn
/**
* Represents a color with red, green, blue and alpha components.
*/
- class GCN_CORE_DECLSPEC Color final
+ class Color final
{
public:
/**
diff --git a/src/guichan/include/guichan/deathlistener.hpp b/src/guichan/include/guichan/deathlistener.hpp
index 3e7884021..cc8d11990 100644
--- a/src/guichan/include/guichan/deathlistener.hpp
+++ b/src/guichan/include/guichan/deathlistener.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -48,7 +67,6 @@
#include <string>
#include "guichan/event.hpp"
-#include "guichan/platform.hpp"
namespace gcn
{
@@ -56,10 +74,10 @@ namespace gcn
* Interface for listening for death events from widgets.
*
* @see Widget::addDeathListener, Widget::removeDeathListener
- * @author Olof Naessén
+ * @author Olof Naessén
* @since 0.6.0
*/
- class GCN_CORE_DECLSPEC DeathListener
+ class DeathListener
{
public:
/**
diff --git a/src/guichan/include/guichan/event.hpp b/src/guichan/include/guichan/event.hpp
index fa3220d51..2a1f4ca4b 100644
--- a/src/guichan/include/guichan/event.hpp
+++ b/src/guichan/include/guichan/event.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -45,8 +64,6 @@
#ifndef GCN_EVENT_HPP
#define GCN_EVENT_HPP
-#include "guichan/platform.hpp"
-
#include "localconsts.h"
namespace gcn
@@ -57,10 +74,10 @@ namespace gcn
* Base class for all events. All events in Guichan should
* inherit from this class.
*
- * @author Olof Naessén
+ * @author Olof Naessén
* @since 0.6.0
*/
- class GCN_CORE_DECLSPEC Event
+ class Event
{
public:
/**
diff --git a/src/guichan/include/guichan/exception.hpp b/src/guichan/include/guichan/exception.hpp
index 63809196d..a60152c96 100644
--- a/src/guichan/include/guichan/exception.hpp
+++ b/src/guichan/include/guichan/exception.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -47,8 +66,6 @@
#include <string>
-#include "guichan/platform.hpp"
-
#include "localconsts.h"
#ifndef __FUNCTION__
@@ -85,7 +102,7 @@ namespace gcn
* throw GCN_EXCEPTION("my error message");
* @endcode
*/
- class GCN_CORE_DECLSPEC Exception final
+ class Exception final
{
public:
/**
diff --git a/src/guichan/include/guichan/focushandler.hpp b/src/guichan/include/guichan/focushandler.hpp
index 2eba92d1c..6cd326d33 100644
--- a/src/guichan/include/guichan/focushandler.hpp
+++ b/src/guichan/include/guichan/focushandler.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -48,7 +67,6 @@
#include <vector>
#include "guichan/event.hpp"
-#include "guichan/platform.hpp"
namespace gcn
{
@@ -68,7 +86,7 @@ namespace gcn
*
* @since 0.1.0
*/
- class GCN_CORE_DECLSPEC FocusHandler
+ class FocusHandler
{
public:
/**
diff --git a/src/guichan/include/guichan/focuslistener.hpp b/src/guichan/include/guichan/focuslistener.hpp
index 32d891800..6b3de5c83 100644
--- a/src/guichan/include/guichan/focuslistener.hpp
+++ b/src/guichan/include/guichan/focuslistener.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -48,7 +67,6 @@
#include <string>
#include "guichan/event.hpp"
-#include "guichan/platform.hpp"
#include "localconsts.h"
@@ -58,10 +76,10 @@ namespace gcn
* Interface for listening for focus events from widgets.
*
* @see Widget::addFocusListener, Widget::removeFocusListener
- * @author Olof Naessén
+ * @author Olof Naessén
* @since 0.7.0
*/
- class GCN_CORE_DECLSPEC FocusListener
+ class FocusListener
{
public:
/**
diff --git a/src/guichan/include/guichan/font.hpp b/src/guichan/include/guichan/font.hpp
index b4550e4fe..8e8ad18c9 100644
--- a/src/guichan/include/guichan/font.hpp
+++ b/src/guichan/include/guichan/font.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -46,7 +65,6 @@
#define GCN_FONT_HPP
#include <string>
-#include "guichan/platform.hpp"
#include "localconsts.h"
@@ -59,7 +77,7 @@ namespace gcn
*
* @see ImageFont
*/
- class GCN_CORE_DECLSPEC Font
+ class Font
{
public:
/**
diff --git a/src/guichan/include/guichan/graphics.hpp b/src/guichan/include/guichan/graphics.hpp
index 831e2601a..dd15827fd 100644
--- a/src/guichan/include/guichan/graphics.hpp
+++ b/src/guichan/include/guichan/graphics.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -49,7 +68,6 @@
#include <stack>
#include "guichan/cliprectangle.hpp"
-#include "guichan/platform.hpp"
namespace gcn
{
@@ -92,7 +110,7 @@ namespace gcn
* SDLGraphics, Image
* @since 0.1.0
*/
- class GCN_CORE_DECLSPEC Graphics
+ class Graphics
{
public:
/**
diff --git a/src/guichan/include/guichan/gui.hpp b/src/guichan/include/guichan/gui.hpp
index 0aa843653..5aca51f4e 100644
--- a/src/guichan/include/guichan/gui.hpp
+++ b/src/guichan/include/guichan/gui.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -51,7 +70,6 @@
#include "guichan/keyevent.hpp"
#include "guichan/mouseevent.hpp"
#include "guichan/mouseinput.hpp"
-#include "guichan/platform.hpp"
namespace gcn
{
@@ -94,7 +112,7 @@ namespace gcn
*
* @see Graphics, Input, Image
*/
- class GCN_CORE_DECLSPEC Gui
+ class Gui
{
public:
/**
diff --git a/src/guichan/include/guichan/image.hpp b/src/guichan/include/guichan/image.hpp
index ec2b37188..c39fe21ab 100644
--- a/src/guichan/include/guichan/image.hpp
+++ b/src/guichan/include/guichan/image.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -47,8 +66,6 @@
#include <string>
-#include "guichan/platform.hpp"
-
#include "localconsts.h"
namespace gcn
@@ -69,7 +86,7 @@ namespace gcn
* OpenGLAllegroImageLoader, OpenGLSDLImageLoader, SDLImageLoader
* @since 0.1.0
*/
- class GCN_CORE_DECLSPEC Image
+ class Image
{
public:
/**
diff --git a/src/guichan/include/guichan/input.hpp b/src/guichan/include/guichan/input.hpp
index 538e78e3c..71a15ce85 100644
--- a/src/guichan/include/guichan/input.hpp
+++ b/src/guichan/include/guichan/input.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -45,8 +64,6 @@
#ifndef GCN_INPUT_HPP
#define GCN_INPUT_HPP
-#include "guichan/platform.hpp"
-
#include "localconsts.h"
namespace gcn
@@ -66,7 +83,7 @@ namespace gcn
* @see AllegroInput, HGEInput, OpenLayerInput,
* SDLInput
*/
- class GCN_CORE_DECLSPEC Input
+ class Input
{
public:
/**
diff --git a/src/guichan/include/guichan/inputevent.hpp b/src/guichan/include/guichan/inputevent.hpp
index 732886de8..30b46676d 100644
--- a/src/guichan/include/guichan/inputevent.hpp
+++ b/src/guichan/include/guichan/inputevent.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -46,17 +65,16 @@
#define GCN_INPUTEVENT_HPP
#include "guichan/event.hpp"
-#include "guichan/platform.hpp"
namespace gcn
{
/**
* Base class for all events concerning input.
*
- * @author Olof Naessén
+ * @author Olof Naessén
* @since 0.6.0
*/
- class GCN_CORE_DECLSPEC InputEvent: public Event
+ class InputEvent: public Event
{
public:
/**
diff --git a/src/guichan/include/guichan/key.hpp b/src/guichan/include/guichan/key.hpp
index 086969b65..46b36a179 100644
--- a/src/guichan/include/guichan/key.hpp
+++ b/src/guichan/include/guichan/key.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -45,8 +64,6 @@
#ifndef GCN_KEY_HPP
#define GCN_KEY_HPP
-#include "guichan/platform.hpp"
-
#include "localconsts.h"
// windows.h defines DELETE which breaks this file as we have a constant named
@@ -61,7 +78,7 @@ namespace gcn
/**
* Represents a key or a character.
*/
- class GCN_CORE_DECLSPEC Key final
+ class Key final
{
public:
/**
diff --git a/src/guichan/include/guichan/keyevent.hpp b/src/guichan/include/guichan/keyevent.hpp
index 4ccb1bf8e..b3a91f640 100644
--- a/src/guichan/include/guichan/keyevent.hpp
+++ b/src/guichan/include/guichan/keyevent.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -47,7 +66,6 @@
#include "guichan/inputevent.hpp"
#include "guichan/key.hpp"
-#include "guichan/platform.hpp"
namespace gcn
{
@@ -56,7 +74,7 @@ namespace gcn
/**
* Represents a key event.
*/
- class GCN_CORE_DECLSPEC KeyEvent: public InputEvent
+ class KeyEvent: public InputEvent
{
public:
/**
diff --git a/src/guichan/include/guichan/keyinput.hpp b/src/guichan/include/guichan/keyinput.hpp
index f38bd4d58..421165d1c 100644
--- a/src/guichan/include/guichan/keyinput.hpp
+++ b/src/guichan/include/guichan/keyinput.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -46,7 +65,6 @@
#define GCN_KEYINPUT_HPP
#include "guichan/key.hpp"
-#include "guichan/platform.hpp"
namespace gcn
{
@@ -57,7 +75,7 @@ namespace gcn
*
* @since 0.1.0
*/
- class GCN_CORE_DECLSPEC KeyInput
+ class KeyInput
{
public:
/**
diff --git a/src/guichan/include/guichan/keylistener.hpp b/src/guichan/include/guichan/keylistener.hpp
index 68657dd0a..bb676052d 100644
--- a/src/guichan/include/guichan/keylistener.hpp
+++ b/src/guichan/include/guichan/keylistener.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -46,7 +65,6 @@
#define GCN_KEYLISTENER_HPP
#include "guichan/keyevent.hpp"
-#include "guichan/platform.hpp"
#include "localconsts.h"
@@ -59,7 +77,7 @@ namespace gcn
*
* @see Widget::addKeyListener, Widget::removeKeyListener
*/
- class GCN_CORE_DECLSPEC KeyListener
+ class KeyListener
{
public:
/**
diff --git a/src/guichan/include/guichan/listmodel.hpp b/src/guichan/include/guichan/listmodel.hpp
index 7e46dae4d..4b98f46fe 100644
--- a/src/guichan/include/guichan/listmodel.hpp
+++ b/src/guichan/include/guichan/listmodel.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -47,8 +66,6 @@
#include <string>
-#include "guichan/platform.hpp"
-
#include "localconsts.h"
namespace gcn
@@ -60,7 +77,7 @@ namespace gcn
* like ListBox, make a derived class from this class that
* represents your list.
*/
- class GCN_CORE_DECLSPEC ListModel
+ class ListModel
{
public:
/**
diff --git a/src/guichan/include/guichan/mouseevent.hpp b/src/guichan/include/guichan/mouseevent.hpp
index dd385106a..57af098ab 100644
--- a/src/guichan/include/guichan/mouseevent.hpp
+++ b/src/guichan/include/guichan/mouseevent.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -46,7 +65,6 @@
#define GCN_MOUSEEVENT_HPP
#include "guichan/inputevent.hpp"
-#include "guichan/platform.hpp"
namespace gcn
{
@@ -56,10 +74,10 @@ namespace gcn
/**
* Represents a mouse event.
*
- * @author Olof Naessén
+ * @author Olof Naessén
* @since 0.6.0
*/
- class GCN_CORE_DECLSPEC MouseEvent: public InputEvent
+ class MouseEvent: public InputEvent
{
public:
/**
diff --git a/src/guichan/include/guichan/mouseinput.hpp b/src/guichan/include/guichan/mouseinput.hpp
index 5037f786a..018205740 100644
--- a/src/guichan/include/guichan/mouseinput.hpp
+++ b/src/guichan/include/guichan/mouseinput.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -45,8 +64,6 @@
#ifndef GCN_MOUSEINPUT_HPP
#define GCN_MOUSEINPUT_HPP
-#include "guichan/platform.hpp"
-
#include "localconsts.h"
namespace gcn
@@ -57,11 +74,11 @@ namespace gcn
* bother using this class unless you implement an Input class for
* a back end.
*
- * @author Olof Naessén
+ * @author Olof Naessén
* @author Per Larsson
* @since 0.1.0
*/
- class GCN_CORE_DECLSPEC MouseInput
+ class MouseInput
{
public:
/**
diff --git a/src/guichan/include/guichan/mouselistener.hpp b/src/guichan/include/guichan/mouselistener.hpp
index 18bf5c062..a024d202f 100644
--- a/src/guichan/include/guichan/mouselistener.hpp
+++ b/src/guichan/include/guichan/mouselistener.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -46,7 +65,6 @@
#define GCN_MOUSELISTENER_HPP
#include "guichan/mouseevent.hpp"
-#include "guichan/platform.hpp"
#include "localconsts.h"
@@ -58,7 +76,7 @@ namespace gcn
* @see Widget::addMouseListener, Widget::removeMouseListener
* @since 0.1.0
*/
- class GCN_CORE_DECLSPEC MouseListener
+ class MouseListener
{
public:
/**
diff --git a/src/guichan/include/guichan/platform.hpp b/src/guichan/include/guichan/platform.hpp
deleted file mode 100644
index a1a730d53..000000000
--- a/src/guichan/include/guichan/platform.hpp
+++ /dev/null
@@ -1,76 +0,0 @@
-/* _______ __ __ __ ______ __ __ _______ __ __
- * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
- * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
- * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / /
- * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / /
- * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
- * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
- *
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
- *
- *
- * Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
- *
- * Visit: http://guichan.sourceforge.net
- *
- * License: (BSD)
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * 3. Neither the name of Guichan nor the names of its contributors may
- * be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GCN_PLATFORM_HPP
-#define GCN_PLATFORM_HPP
-
-#if defined (__MINGW32__) && defined(GUICHAN_BUILD)
-#define GCN_CORE_DECLSPEC __declspec(dllexport)
-
-#elif defined (__MINGW32__) && defined(GUICHAN_EXTENSION_BUILD)
-#define GCN_EXTENSION_DECLSPEC __declspec(dllexport)
-#define GCN_CORE_DECLSPEC __declspec(dllimport)
-
-#elif defined (__MINGW32__) && defined(GUICHAN_DLL_IMPORT)
-#define GCN_CORE_DECLSPEC __declspec(dllimport)
-#define GCN_EXTENSION_DECLSPEC __declspec(dllimport)
-
-#elif defined(_MSC_VER) && defined(GUICHAN_BUILD)
-#define GCN_CORE_DECLSPEC _declspec(dllexport)
-
-#elif defined(_MSC_VER) && defined(GUICHAN_EXTENSION_BUILD)
-#define GCN_CORE_DECLSPEC _declspec(dllimport)
-#define GCN_EXTENSION_DECLSPEC _declspec(dllexport)
-
-#endif
-
-#ifndef GCN_CORE_DECLSPEC
-#define GCN_CORE_DECLSPEC
-#endif
-
-#ifndef GCN_EXTENSION_DECLSPEC
-#define GCN_EXTENSION_DECLSPEC
-#endif
-
-#endif // end GCN_PLATFORM_HPP
diff --git a/src/guichan/include/guichan/rectangle.hpp b/src/guichan/include/guichan/rectangle.hpp
index de32fbb99..b8503db98 100644
--- a/src/guichan/include/guichan/rectangle.hpp
+++ b/src/guichan/include/guichan/rectangle.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -45,8 +64,6 @@
#ifndef GCN_RECTANGLE_HPP
#define GCN_RECTANGLE_HPP
-#include "guichan/platform.hpp"
-
#include <iostream>
#include "localconsts.h"
@@ -58,7 +75,7 @@ namespace gcn
*
* @since 0.1.0
*/
- class GCN_CORE_DECLSPEC Rectangle
+ class Rectangle
{
public:
/**
diff --git a/src/guichan/include/guichan/sdl/sdlpixel.hpp b/src/guichan/include/guichan/sdl/sdlpixel.hpp
index ab457bc48..99818d42e 100644
--- a/src/guichan/include/guichan/sdl/sdlpixel.hpp
+++ b/src/guichan/include/guichan/sdl/sdlpixel.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/include/guichan/selectionevent.hpp b/src/guichan/include/guichan/selectionevent.hpp
index 5880be79e..a4a3da0b3 100644
--- a/src/guichan/include/guichan/selectionevent.hpp
+++ b/src/guichan/include/guichan/selectionevent.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -46,7 +65,6 @@
#define GCN_SELECTIONEVENT_HPP
#include "guichan/event.hpp"
-#include "guichan/platform.hpp"
#include "localconsts.h"
@@ -57,10 +75,10 @@ namespace gcn
/**
* Represents a selection event.
*
- * @author Olof Naessén
+ * @author Olof Naessén
* @since 0.8.0
*/
- class GCN_CORE_DECLSPEC SelectionEvent final: public Event
+ class SelectionEvent final: public Event
{
public:
/**
diff --git a/src/guichan/include/guichan/selectionlistener.hpp b/src/guichan/include/guichan/selectionlistener.hpp
index 298a11e3d..0d7f63bd8 100644
--- a/src/guichan/include/guichan/selectionlistener.hpp
+++ b/src/guichan/include/guichan/selectionlistener.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -48,7 +67,6 @@
#include <string>
#include "guichan/selectionevent.hpp"
-#include "guichan/platform.hpp"
#include "localconsts.h"
@@ -61,10 +79,10 @@ namespace gcn
* ListBox::removeSelectionListener,
* DropDown::addSelectionListener,
* DropDown::removeSelectionListener
- * @author Olof Naessén
+ * @author Olof Naessén
* @since 0.8.0
*/
- class GCN_CORE_DECLSPEC SelectionListener
+ class SelectionListener
{
public:
/**
diff --git a/src/guichan/include/guichan/widget.hpp b/src/guichan/include/guichan/widget.hpp
index f4d316b25..fe02d3b14 100644
--- a/src/guichan/include/guichan/widget.hpp
+++ b/src/guichan/include/guichan/widget.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -76,11 +95,11 @@ namespace gcn
* NOTE: Functions begining with underscore "_" should not
* be overloaded unless you know what you are doing
*
- * @author Olof Naessén
+ * @author Olof Naessén
* @author Per Larsson.
* @since 0.1.0
*/
- class GCN_CORE_DECLSPEC Widget
+ class Widget
{
public:
/**
@@ -1010,7 +1029,7 @@ namespace gcn
* Distributes hidden events to all of the widget's listeners.
*
* @since 0.8.0
- * @author Olof Naessén
+ * @author Olof Naessén
*/
void distributeHiddenEvent();
@@ -1018,7 +1037,7 @@ namespace gcn
* Distributes shown events to all of the widget's listeners.
*
* @since 0.8.0
- * @author Olof Naessén
+ * @author Olof Naessén
*/
void distributeShownEvent();
diff --git a/src/guichan/include/guichan/widgetlistener.hpp b/src/guichan/include/guichan/widgetlistener.hpp
index 65cb7fc1d..eb584b0ed 100644
--- a/src/guichan/include/guichan/widgetlistener.hpp
+++ b/src/guichan/include/guichan/widgetlistener.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -48,7 +67,6 @@
#include <string>
#include "guichan/event.hpp"
-#include "guichan/platform.hpp"
#include "localconsts.h"
@@ -60,10 +78,10 @@ namespace gcn
* invoked.
*
* @see Widget::addWidgetListener, Widget::removeWidgetListener
- * @author Olof Naessén
+ * @author Olof Naessén
* @since 0.8.0
*/
- class GCN_CORE_DECLSPEC WidgetListener
+ class WidgetListener
{
public:
/**
diff --git a/src/guichan/include/guichan/widgets/button.hpp b/src/guichan/include/guichan/widgets/button.hpp
index 225a3c23f..91c526d4f 100644
--- a/src/guichan/include/guichan/widgets/button.hpp
+++ b/src/guichan/include/guichan/widgets/button.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -52,7 +71,6 @@
#include "guichan/keylistener.hpp"
#include "guichan/mouseevent.hpp"
#include "guichan/mouselistener.hpp"
-#include "guichan/platform.hpp"
#include "guichan/widget.hpp"
namespace gcn
@@ -66,10 +84,10 @@ namespace gcn
*
* @see ImageButton
*/
- class GCN_CORE_DECLSPEC Button : public Widget,
- public MouseListener,
- public KeyListener,
- public FocusListener
+ class Button : public Widget,
+ public MouseListener,
+ public KeyListener,
+ public FocusListener
{
public:
/**
diff --git a/src/guichan/include/guichan/widgets/checkbox.hpp b/src/guichan/include/guichan/widgets/checkbox.hpp
index f89ac355e..465de566d 100644
--- a/src/guichan/include/guichan/widgets/checkbox.hpp
+++ b/src/guichan/include/guichan/widgets/checkbox.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -49,7 +68,6 @@
#include "guichan/keylistener.hpp"
#include "guichan/mouselistener.hpp"
-#include "guichan/platform.hpp"
#include "guichan/widget.hpp"
namespace gcn
@@ -62,7 +80,7 @@ namespace gcn
* If a check box's state changes an action event will be sent to all action
* listeners of the check box.
*/
- class GCN_CORE_DECLSPEC CheckBox :
+ class CheckBox :
public Widget,
public MouseListener,
public KeyListener
diff --git a/src/guichan/include/guichan/widgets/container.hpp b/src/guichan/include/guichan/widgets/container.hpp
index 21a612379..b6efbf361 100644
--- a/src/guichan/include/guichan/widgets/container.hpp
+++ b/src/guichan/include/guichan/widgets/container.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -49,7 +68,6 @@
#include "guichan/basiccontainer.hpp"
#include "guichan/graphics.hpp"
-#include "guichan/platform.hpp"
namespace gcn
{
@@ -61,7 +79,7 @@ namespace gcn
*
* @see Gui::setTop
*/
- class GCN_CORE_DECLSPEC Container: public BasicContainer
+ class Container: public BasicContainer
{
public:
/**
diff --git a/src/guichan/include/guichan/widgets/label.hpp b/src/guichan/include/guichan/widgets/label.hpp
index 804842a07..a8c2ae7ea 100644
--- a/src/guichan/include/guichan/widgets/label.hpp
+++ b/src/guichan/include/guichan/widgets/label.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -48,7 +67,6 @@
#include <string>
#include "guichan/graphics.hpp"
-#include "guichan/platform.hpp"
#include "guichan/widget.hpp"
namespace gcn
@@ -56,7 +74,7 @@ namespace gcn
/**
* Implementation of a label capable of displaying a caption.
*/
- class GCN_CORE_DECLSPEC Label: public Widget
+ class Label: public Widget
{
public:
/**
diff --git a/src/guichan/include/guichan/widgets/listbox.hpp b/src/guichan/include/guichan/widgets/listbox.hpp
index e19427a1e..d28664455 100644
--- a/src/guichan/include/guichan/widgets/listbox.hpp
+++ b/src/guichan/include/guichan/widgets/listbox.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -50,7 +69,6 @@
#include "guichan/keylistener.hpp"
#include "guichan/listmodel.hpp"
#include "guichan/mouselistener.hpp"
-#include "guichan/platform.hpp"
#include "guichan/widget.hpp"
namespace gcn
@@ -68,7 +86,7 @@ namespace gcn
* a mouse click or by using the enter or space key an action event will be
* sent to all action listeners of the list box.
*/
- class GCN_CORE_DECLSPEC ListBox :
+ class ListBox :
public Widget,
public MouseListener,
public KeyListener
diff --git a/src/guichan/include/guichan/widgets/radiobutton.hpp b/src/guichan/include/guichan/widgets/radiobutton.hpp
index 32ec1fdbf..2a93a82ee 100644
--- a/src/guichan/include/guichan/widgets/radiobutton.hpp
+++ b/src/guichan/include/guichan/widgets/radiobutton.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -50,7 +69,6 @@
#include "guichan/keylistener.hpp"
#include "guichan/mouselistener.hpp"
-#include "guichan/platform.hpp"
#include "guichan/widget.hpp"
namespace gcn
@@ -65,7 +83,7 @@ namespace gcn
* If a radio button's state changes an action event will be sent to all action
* listeners of the check box.
*/
- class GCN_CORE_DECLSPEC RadioButton :
+ class RadioButton :
public Widget,
public MouseListener,
public KeyListener
diff --git a/src/guichan/include/guichan/widgets/scrollarea.hpp b/src/guichan/include/guichan/widgets/scrollarea.hpp
index c0d16456b..30fa64abc 100644
--- a/src/guichan/include/guichan/widgets/scrollarea.hpp
+++ b/src/guichan/include/guichan/widgets/scrollarea.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -49,7 +68,6 @@
#include "guichan/basiccontainer.hpp"
#include "guichan/mouselistener.hpp"
-#include "guichan/platform.hpp"
namespace gcn
{
@@ -58,7 +76,7 @@ namespace gcn
* A scroll area can be customized to always show scroll bars or to show them only when
* necessary.
*/
- class GCN_CORE_DECLSPEC ScrollArea:
+ class ScrollArea:
public BasicContainer,
public MouseListener
{
diff --git a/src/guichan/include/guichan/widgets/slider.hpp b/src/guichan/include/guichan/widgets/slider.hpp
index 28c3af0d0..04f774b21 100644
--- a/src/guichan/include/guichan/widgets/slider.hpp
+++ b/src/guichan/include/guichan/widgets/slider.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -47,7 +66,6 @@
#include "guichan/keylistener.hpp"
#include "guichan/mouselistener.hpp"
-#include "guichan/platform.hpp"
#include "guichan/widget.hpp"
namespace gcn
@@ -59,7 +77,7 @@ namespace gcn
* If the selected value is changed an action event will be sent to all
* action listeners of the slider.
*/
- class GCN_CORE_DECLSPEC Slider :
+ class Slider :
public Widget,
public MouseListener,
public KeyListener
diff --git a/src/guichan/include/guichan/widgets/textbox.hpp b/src/guichan/include/guichan/widgets/textbox.hpp
index 49b2a5d02..a75b52115 100644
--- a/src/guichan/include/guichan/widgets/textbox.hpp
+++ b/src/guichan/include/guichan/widgets/textbox.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -51,7 +70,6 @@
#include "guichan/keylistener.hpp"
#include "guichan/mouselistener.hpp"
-#include "guichan/platform.hpp"
#include "guichan/widget.hpp"
namespace gcn
@@ -59,7 +77,7 @@ namespace gcn
/**
* An implementation of a text box where a user can enter text that contains of many lines.
*/
- class GCN_CORE_DECLSPEC TextBox:
+ class TextBox:
public Widget,
public MouseListener,
public KeyListener
diff --git a/src/guichan/include/guichan/widgets/textfield.hpp b/src/guichan/include/guichan/widgets/textfield.hpp
index 7b7528c46..b1293045f 100644
--- a/src/guichan/include/guichan/widgets/textfield.hpp
+++ b/src/guichan/include/guichan/widgets/textfield.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -47,7 +66,6 @@
#include "guichan/keylistener.hpp"
#include "guichan/mouselistener.hpp"
-#include "guichan/platform.hpp"
#include "guichan/widget.hpp"
#include <string>
@@ -57,7 +75,7 @@ namespace gcn
/**
* An implementation of a text field where a user can enter a line of text.
*/
- class GCN_CORE_DECLSPEC TextField:
+ class TextField:
public Widget,
public MouseListener,
public KeyListener
diff --git a/src/guichan/include/guichan/widgets/window.hpp b/src/guichan/include/guichan/widgets/window.hpp
index 5fe1bfb21..bf5dd2e7c 100644
--- a/src/guichan/include/guichan/widgets/window.hpp
+++ b/src/guichan/include/guichan/widgets/window.hpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
@@ -48,7 +67,6 @@
#include <string>
#include "guichan/mouselistener.hpp"
-#include "guichan/platform.hpp"
#include "guichan/widgets/container.hpp"
namespace gcn
@@ -56,8 +74,8 @@ namespace gcn
/**
* An implementation of a movable window that can contain other widgets.
*/
- class GCN_CORE_DECLSPEC Window : public Container,
- public MouseListener
+ class Window : public Container,
+ public MouseListener
{
public:
/**
diff --git a/src/guichan/inputevent.cpp b/src/guichan/inputevent.cpp
index 51dcbcd83..ac7eea5bd 100644
--- a/src/guichan/inputevent.cpp
+++ b/src/guichan/inputevent.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/key.cpp b/src/guichan/key.cpp
index 559bfa3be..24d817fdb 100644
--- a/src/guichan/key.cpp
+++ b/src/guichan/key.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/keyevent.cpp b/src/guichan/keyevent.cpp
index 8fdcc837d..1f325ef1d 100644
--- a/src/guichan/keyevent.cpp
+++ b/src/guichan/keyevent.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/keyinput.cpp b/src/guichan/keyinput.cpp
index 32c1a7234..a18113c8d 100644
--- a/src/guichan/keyinput.cpp
+++ b/src/guichan/keyinput.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/mouseevent.cpp b/src/guichan/mouseevent.cpp
index 37ebf65c1..c24be1252 100644
--- a/src/guichan/mouseevent.cpp
+++ b/src/guichan/mouseevent.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/mouseinput.cpp b/src/guichan/mouseinput.cpp
index e4917c33f..b13708bb7 100644
--- a/src/guichan/mouseinput.cpp
+++ b/src/guichan/mouseinput.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/rectangle.cpp b/src/guichan/rectangle.cpp
index 4f37e5e19..3aca53a0a 100644
--- a/src/guichan/rectangle.cpp
+++ b/src/guichan/rectangle.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/selectionevent.cpp b/src/guichan/selectionevent.cpp
index fce001cb7..2606d84ef 100644
--- a/src/guichan/selectionevent.cpp
+++ b/src/guichan/selectionevent.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/widget.cpp b/src/guichan/widget.cpp
index 3ccec0730..0cd7883d7 100644
--- a/src/guichan/widget.cpp
+++ b/src/guichan/widget.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/widgets/button.cpp b/src/guichan/widgets/button.cpp
index 96994aded..1226e157a 100644
--- a/src/guichan/widgets/button.cpp
+++ b/src/guichan/widgets/button.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/widgets/checkbox.cpp b/src/guichan/widgets/checkbox.cpp
index 4e2fdbc3a..4b3c7b966 100644
--- a/src/guichan/widgets/checkbox.cpp
+++ b/src/guichan/widgets/checkbox.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/widgets/container.cpp b/src/guichan/widgets/container.cpp
index bd19224aa..7ea07e529 100644
--- a/src/guichan/widgets/container.cpp
+++ b/src/guichan/widgets/container.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/widgets/label.cpp b/src/guichan/widgets/label.cpp
index 16afcb044..92962e907 100644
--- a/src/guichan/widgets/label.cpp
+++ b/src/guichan/widgets/label.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/widgets/listbox.cpp b/src/guichan/widgets/listbox.cpp
index bc4647ef0..9122e8cc8 100644
--- a/src/guichan/widgets/listbox.cpp
+++ b/src/guichan/widgets/listbox.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/widgets/radiobutton.cpp b/src/guichan/widgets/radiobutton.cpp
index 77d672cc0..26ce731ed 100644
--- a/src/guichan/widgets/radiobutton.cpp
+++ b/src/guichan/widgets/radiobutton.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/widgets/scrollarea.cpp b/src/guichan/widgets/scrollarea.cpp
index aae116462..ddc4405e2 100644
--- a/src/guichan/widgets/scrollarea.cpp
+++ b/src/guichan/widgets/scrollarea.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/widgets/slider.cpp b/src/guichan/widgets/slider.cpp
index 4f370545d..849101fd8 100644
--- a/src/guichan/widgets/slider.cpp
+++ b/src/guichan/widgets/slider.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/widgets/textbox.cpp b/src/guichan/widgets/textbox.cpp
index 4f104833f..e3bfd39f5 100644
--- a/src/guichan/widgets/textbox.cpp
+++ b/src/guichan/widgets/textbox.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/widgets/textfield.cpp b/src/guichan/widgets/textfield.cpp
index 64a0209b5..1e4309266 100644
--- a/src/guichan/widgets/textfield.cpp
+++ b/src/guichan/widgets/textfield.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/guichan/widgets/window.cpp b/src/guichan/widgets/window.cpp
index 3ed6d969f..8865444e0 100644
--- a/src/guichan/widgets/window.cpp
+++ b/src/guichan/widgets/window.cpp
@@ -1,3 +1,23 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
/* _______ __ __ __ ______ __ __ _______ __ __
* / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\
* / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / /
@@ -6,12 +26,11 @@
* /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ /
* \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/
*
- * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
- * Copyright (C) 2011-2014 The ManaPlus Developers
+ * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson
*
*
* Per Larsson a.k.a finalman
- * Olof Naessén a.k.a jansem/yakslem
+ * Olof Naessén a.k.a jansem/yakslem
*
* Visit: http://guichan.sourceforge.net
*
diff --git a/src/input/keyboarddata.h b/src/input/keyboarddata.h
index da0d22fee..c250b759e 100644
--- a/src/input/keyboarddata.h
+++ b/src/input/keyboarddata.h
@@ -1811,9 +1811,9 @@ static const KeyData keyData[Input::KEY_TOTAL] = {
Input::KEY_NO_VALUE, 50,
COND_GAME | COND_VALIDSPEED | COND_EMODS},
{"keyMod",
- INPUT_KEYBOARD, SDLK_LSHIFT,
INPUT_UNKNOWN, Input::KEY_NO_VALUE,
- Input::GRP_GUI,
+ INPUT_UNKNOWN, Input::KEY_NO_VALUE,
+ 0,
nullptr,
Input::KEY_NO_VALUE, 50,
COND_DEFAULT},
diff --git a/src/input/keydata.h b/src/input/keydata.h
index 52bc7f6be..a0fb8341b 100644
--- a/src/input/keydata.h
+++ b/src/input/keydata.h
@@ -319,7 +319,7 @@ namespace Input
KEY_AWAY,
KEY_RIGHT_CLICK,
KEY_CAMERA,
- KEY_MOD,
+ KEY_RESERVED1,
KEY_GUI_UP,
KEY_GUI_DOWN,
KEY_GUI_LEFT,
diff --git a/src/localconsts.h b/src/localconsts.h
index 92c36d92a..58b469f01 100644
--- a/src/localconsts.h
+++ b/src/localconsts.h
@@ -33,6 +33,13 @@
#endif
#endif
+#ifndef DEBUGBUILD
+#ifndef USE_INTERNALGUICHAN
+#warning using depricated way for linking with guichan. \
+ Please removed configure flag --without-internalguichan
+#endif
+#endif
+
#if !defined(__GXX_EXPERIMENTAL_CXX0X__)
#undef nullptr
#define nullptr 0
diff --git a/src/main.h b/src/main.h
index a0fbf3c35..976b4e584 100644
--- a/src/main.h
+++ b/src/main.h
@@ -45,8 +45,8 @@
* different interfaces, which have different implementations for each server.
*/
-#define SMALL_VERSION "1.4.1.18"
-#define CHECK_VERSION "01.04.01.18"
+#define SMALL_VERSION "1.4.2.1"
+#define CHECK_VERSION "01.04.02.01"
#ifdef HAVE_CONFIG_H
#include "../config.h"
diff --git a/src/net/download.cpp b/src/net/download.cpp
index d986fa232..d0c6515fc 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -58,9 +58,11 @@ enum
namespace Net
{
+std::string Download::mUploadResponse = "";
+
Download::Download(void *const ptr, const std::string &url,
const DownloadUpdate updateFunction,
- const bool ignoreError) :
+ const bool ignoreError, const bool isUpload) :
mPtr(ptr),
mUrl(url),
mOptions(),
@@ -71,8 +73,10 @@ Download::Download(void *const ptr, const std::string &url,
mThread(nullptr),
mCurl(nullptr),
mHeaders(nullptr),
+ mFormPost(nullptr),
mError(static_cast<char*>(calloc(CURL_ERROR_SIZE + 1, 1))),
- mIgnoreError(ignoreError)
+ mIgnoreError(ignoreError),
+ mUpload(isUpload)
{
if (mError)
mError[0] = 0;
@@ -80,23 +84,34 @@ Download::Download(void *const ptr, const std::string &url,
mOptions.cancel = 0;
mOptions.memoryWrite = 0;
mOptions.checkAdler = true;
- const std::string serverName = client->getServerName();
- if (!serverName.empty())
+ if (!mUpload)
{
- if (mUrl.find("?") == std::string::npos)
- mUrl.append("?host=");
- else
- mUrl.append("&host=");
- mUrl.append(serverName);
+ const std::string serverName = client->getServerName();
+ if (!serverName.empty())
+ {
+ if (mUrl.find("?") == std::string::npos)
+ mUrl.append("?host=");
+ else
+ mUrl.append("&host=");
+ mUrl.append(serverName);
+ }
}
}
Download::~Download()
{
+ if (mFormPost)
+ {
+ curl_formfree(mFormPost);
+ mFormPost = nullptr;
+ }
+
if (mHeaders)
+ {
curl_slist_free_all(mHeaders);
+ mHeaders = nullptr;
+ }
- mHeaders = nullptr;
int status;
if (mThread && SDL_GetThreadID(mThread))
SDL_WaitThread(mThread, &status);
@@ -211,9 +226,13 @@ int Download::downloadProgress(void *clientp, double dltotal, double dlnow,
double ultotal A_UNUSED, double ulnow A_UNUSED)
{
Download *const d = reinterpret_cast<Download *const>(clientp);
+
if (!d)
return -5;
+ if (d->mUpload)
+ return 0;
+
if (d->mOptions.cancel)
{
return d->mUpdateFunction(d->mPtr, DOWNLOAD_STATUS_CANCELLED,
@@ -236,8 +255,19 @@ int Download::downloadThread(void *ptr)
if (!d)
return 0;
- const std::string outFilename = !d->mOptions.memoryWrite
- ? (d->mFileName + ".part") : "";
+ std::string outFilename;
+ if (d->mUpload)
+ {
+ outFilename = d->mFileName;
+ prepareForm(&d->mFormPost, outFilename);
+ }
+ else
+ {
+ if (!d->mOptions.memoryWrite)
+ outFilename = d->mFileName + ".part";
+ else
+ outFilename = "";
+ }
while (attempts < 3 && !complete && !d->mOptions.cancel)
{
@@ -249,45 +279,57 @@ int Download::downloadThread(void *ptr)
d->mThread = nullptr;
return 0;
}
-
d->mCurl = curl_easy_init();
if (d->mCurl && !d->mOptions.cancel)
{
FILE *file = nullptr;
- logger->log("Downloading: %s", d->mUrl.c_str());
-
- curl_easy_setopt(d->mCurl, CURLOPT_FOLLOWLOCATION, 1);
- curl_easy_setopt(d->mCurl, CURLOPT_HTTPHEADER, d->mHeaders);
- if (d->mOptions.memoryWrite)
+ if (d->mUpload)
{
- curl_easy_setopt(d->mCurl, CURLOPT_FAILONERROR, 1);
+ logger->log("Uploading: %s", d->mUrl.c_str());
+ curl_easy_setopt(d->mCurl, CURLOPT_URL, d->mUrl.c_str());
+ curl_easy_setopt(d->mCurl, CURLOPT_HTTPPOST, d->mFormPost);
curl_easy_setopt(d->mCurl, CURLOPT_WRITEFUNCTION,
- d->mWriteFunction);
- curl_easy_setopt(d->mCurl, CURLOPT_WRITEDATA, d->mPtr);
+ &Download::writeFunction);
+ mUploadResponse.clear();
}
else
{
- file = fopen(outFilename.c_str(), "w+b");
- if (file)
- curl_easy_setopt(d->mCurl, CURLOPT_WRITEDATA, file);
+ logger->log("Downloading: %s", d->mUrl.c_str());
+ curl_easy_setopt(d->mCurl, CURLOPT_FOLLOWLOCATION, 1);
+ curl_easy_setopt(d->mCurl, CURLOPT_HTTPHEADER, d->mHeaders);
+ if (d->mOptions.memoryWrite)
+ {
+ curl_easy_setopt(d->mCurl, CURLOPT_FAILONERROR, 1);
+ curl_easy_setopt(d->mCurl, CURLOPT_WRITEFUNCTION,
+ d->mWriteFunction);
+ curl_easy_setopt(d->mCurl, CURLOPT_WRITEDATA, d->mPtr);
+ }
+ else
+ {
+ file = fopen(outFilename.c_str(), "w+b");
+ if (file)
+ curl_easy_setopt(d->mCurl, CURLOPT_WRITEDATA, file);
+ }
+ curl_easy_setopt(d->mCurl, CURLOPT_USERAGENT,
+ strprintf(PACKAGE_EXTENDED_VERSION,
+ branding.getStringValue("appName").c_str()).c_str());
+
+
+ curl_easy_setopt(d->mCurl, CURLOPT_ERRORBUFFER, d->mError);
+ curl_easy_setopt(d->mCurl, CURLOPT_URL, d->mUrl.c_str());
+ curl_easy_setopt(d->mCurl, CURLOPT_NOPROGRESS, 0);
+ curl_easy_setopt(d->mCurl, CURLOPT_PROGRESSFUNCTION,
+ &downloadProgress);
+ curl_easy_setopt(d->mCurl, CURLOPT_PROGRESSDATA, ptr);
+ curl_easy_setopt(d->mCurl, CURLOPT_NOSIGNAL, 1);
+ curl_easy_setopt(d->mCurl, CURLOPT_CONNECTTIMEOUT, 30);
+ curl_easy_setopt(d->mCurl, CURLOPT_TIMEOUT, 1800);
+ addProxy(d->mCurl);
+ secureCurl(d->mCurl);
}
- curl_easy_setopt(d->mCurl, CURLOPT_USERAGENT,
- strprintf(PACKAGE_EXTENDED_VERSION,
- branding.getStringValue("appName").c_str()).c_str());
- curl_easy_setopt(d->mCurl, CURLOPT_ERRORBUFFER, d->mError);
- curl_easy_setopt(d->mCurl, CURLOPT_URL, d->mUrl.c_str());
- curl_easy_setopt(d->mCurl, CURLOPT_NOPROGRESS, 0);
- curl_easy_setopt(d->mCurl, CURLOPT_PROGRESSFUNCTION,
- &downloadProgress);
- curl_easy_setopt(d->mCurl, CURLOPT_PROGRESSDATA, ptr);
- curl_easy_setopt(d->mCurl, CURLOPT_NOSIGNAL, 1);
- curl_easy_setopt(d->mCurl, CURLOPT_CONNECTTIMEOUT, 30);
- curl_easy_setopt(d->mCurl, CURLOPT_TIMEOUT, 1800);
- addProxy(d->mCurl);
- secureCurl(d->mCurl);
if ((res = curl_easy_perform(d->mCurl)) != 0
&& !d->mOptions.cancel)
@@ -314,15 +356,13 @@ int Download::downloadThread(void *ptr)
d->mUpdateFunction(d->mPtr, DOWNLOAD_STATUS_ERROR, 0, 0);
- if (!d->mOptions.memoryWrite)
+ if (file)
{
- if (file)
- {
- fclose(file);
- file = nullptr;
- }
- ::remove(outFilename.c_str());
+ fclose(file);
+ file = nullptr;
}
+ if (!d->mUpload && !d->mOptions.memoryWrite)
+ ::remove(outFilename.c_str());
attempts++;
continue;
}
@@ -330,58 +370,72 @@ int Download::downloadThread(void *ptr)
curl_easy_cleanup(d->mCurl);
d->mCurl = nullptr;
- if (!d->mOptions.memoryWrite)
+ if (d->mUpload)
{
- // Don't check resources.xml checksum
- if (d->mOptions.checkAdler)
- {
- const unsigned long adler = fadler32(file);
-
- if (d->mAdler != adler)
- {
- if (file)
- {
- fclose(file);
- file = nullptr;
- }
-
- // Remove the corrupted file
- ::remove(d->mFileName.c_str());
- logger->log_r("Checksum for file %s failed: (%lx/%lx)",
- d->mFileName.c_str(),
- adler, d->mAdler);
- attempts++;
- continue; // Bail out here to avoid the renaming
- }
- }
if (file)
{
fclose(file);
file = nullptr;
}
-
- // Any existing file with this name is deleted first, otherwise
- // the rename will fail on Windows.
- if (!d->mOptions.cancel)
+ // need check first if we read data from server
+ complete = true;
+ }
+ else
+ {
+ if (!d->mOptions.memoryWrite)
{
- ::remove(d->mFileName.c_str());
- Files::renameFile(outFilename, d->mFileName);
+ // Don't check resources.xml checksum
+ if (d->mOptions.checkAdler)
+ {
+ const unsigned long adler = fadler32(file);
- // Check if we can open it and no errors were encountered
- // during renaming
- file = fopen(d->mFileName.c_str(), "rb");
+ if (d->mAdler != adler)
+ {
+ if (file)
+ {
+ fclose(file);
+ file = nullptr;
+ }
+
+ // Remove the corrupted file
+ ::remove(d->mFileName.c_str());
+ logger->log_r("Checksum for file %s failed:"
+ " (%lx/%lx)",
+ d->mFileName.c_str(),
+ adler, d->mAdler);
+ attempts++;
+ continue; // Bail out here to avoid the renaming
+ }
+ }
if (file)
{
fclose(file);
file = nullptr;
- complete = true;
+ }
+
+ // Any existing file with this name is deleted first,
+ // otherwise the rename will fail on Windows.
+ if (!d->mOptions.cancel)
+ {
+ ::remove(d->mFileName.c_str());
+ Files::renameFile(outFilename, d->mFileName);
+
+ // Check if we can open it and no errors were
+ // encountered during renaming
+ file = fopen(d->mFileName.c_str(), "rb");
+ if (file)
+ {
+ fclose(file);
+ file = nullptr;
+ complete = true;
+ }
}
}
- }
- else
- {
- // It's stored in memory, we're done
- complete = true;
+ else
+ {
+ // It's stored in memory, we're done
+ complete = true;
+ }
}
}
@@ -400,6 +454,8 @@ int Download::downloadThread(void *ptr)
attempts++;
}
+ d->mThread = nullptr;
+
if (d->mOptions.cancel)
{
// Nothing to do...
@@ -413,7 +469,6 @@ int Download::downloadThread(void *ptr)
d->mUpdateFunction(d->mPtr, DOWNLOAD_STATUS_COMPLETE, 0, 0);
}
- d->mThread = nullptr;
return 0;
}
@@ -481,4 +536,39 @@ void Download::secureCurl(CURL *const curl)
#endif
}
+void Download::prepareForm(curl_httppost **form, const std::string &fileName)
+{
+ curl_httppost *lastPtr = nullptr;
+
+ std::ifstream file;
+ file.open(fileName.c_str(), std::ios::in);
+ if (!file.is_open())
+ return;
+
+ char *line = new char[10001];
+ std::ostringstream str;
+ while (file.getline(line, 10000))
+ str << line << "\n";
+
+ delete [] line;
+
+ curl_formadd(form, &lastPtr,
+ CURLFORM_COPYNAME, "sprunge",
+ CURLFORM_COPYCONTENTS, str.str().c_str(),
+ CURLFORM_END);
+}
+
+size_t Download::writeFunction(void *ptr,
+ size_t size,
+ size_t nmemb,
+ void *stream A_UNUSED)
+{
+ const size_t totalMem = size * nmemb;
+ char *buf = new char[totalMem + 1];
+ memcpy(buf, ptr, totalMem);
+ buf[totalMem] = 0;
+ mUploadResponse.append(buf);
+ return totalMem;
+}
+
} // namespace Net
diff --git a/src/net/download.h b/src/net/download.h
index 4fe0f67db..bc06f1974 100644
--- a/src/net/download.h
+++ b/src/net/download.h
@@ -46,6 +46,7 @@ typedef size_t (*WriteFunction)( void *ptr, size_t size, size_t nmemb,
struct SDL_Thread;
typedef void CURL;
+struct curl_httppost;
struct curl_slist;
namespace Net
@@ -55,7 +56,7 @@ class Download final
public:
Download(void *const ptr, const std::string &url,
const DownloadUpdate updateFunction,
- const bool ignoreError = false);
+ const bool ignoreError, const bool isUpload);
A_DELETE_COPY(Download)
@@ -91,6 +92,12 @@ class Download final
void setIgnoreError(const bool n)
{ mIgnoreError = n; }
+ static size_t writeFunction(void *ptr, size_t size,
+ size_t nmemb, void *stream);
+
+ static void prepareForm(curl_httppost **form,
+ const std::string &fileName);
+
static unsigned long fadler32(FILE *const file) A_WARN_UNUSED;
static void addProxy(CURL *const curl);
@@ -99,11 +106,15 @@ class Download final
static unsigned long adlerBuffer(char *buffer, int size);
+ static std::string getUploadResponse()
+ { return mUploadResponse; }
+
private:
static int downloadThread(void *ptr);
static int downloadProgress(void *clientp, double dltotal,
double dlnow, double ultotal,
double ulnow);
+ static std::string mUploadResponse;
void *mPtr;
std::string mUrl;
struct
@@ -119,8 +130,10 @@ class Download final
SDL_Thread *mThread;
CURL *mCurl;
curl_slist *mHeaders;
+ curl_httppost *mFormPost;
char *mError;
bool mIgnoreError;
+ bool mUpload;
};
} // namespace Net
diff --git a/src/net/sdltcpnet.cpp b/src/net/sdltcpnet.cpp
index 7530e0f53..103620a5b 100644
--- a/src/net/sdltcpnet.cpp
+++ b/src/net/sdltcpnet.cpp
@@ -89,7 +89,9 @@ int TcpNet::resolveHost(IPaddress *const address, const char *const host,
TcpNet::Socket TcpNet::open(IPaddress *const ip)
{
const TcpNet::Socket sock = SDLNet_TCP_Open(ip);
-#ifndef __native_client__
+#if !defined(__native_client__) \
+ || defined(TCP_THIN_LINEAR_TIMEOUTS) \
+ || defined(TCP_THIN_DUPACK)
if (sock && ip)
{
const TCPsocketHack *const hack
diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp
index c88892cc4..6ad1c67d7 100644
--- a/src/render/graphics.cpp
+++ b/src/render/graphics.cpp
@@ -51,6 +51,8 @@ Graphics::Graphics() :
gcn::Graphics(),
mWidth(0),
mHeight(0),
+ mActualWidth(0),
+ mActualHeight(0),
mWindow(nullptr),
#ifdef USE_SDL2
mRenderer(nullptr),
@@ -72,6 +74,7 @@ Graphics::Graphics() :
mName("Unknown"),
mStartFreeMem(0),
mSync(false),
+ mScale(1),
mColor(),
mColor2()
{
@@ -105,21 +108,49 @@ void Graphics::setSync(const bool sync)
mSync = sync;
}
-void Graphics::setMainFlags(const int w, const int h, const int bpp,
- const bool fs, const bool hwaccel,
- const bool resize, const bool noFrame)
+void Graphics::setMainFlags(const int w, const int h,
+ const int scale,
+ const int bpp,
+ const bool fs,
+ const bool hwaccel,
+ const bool resize,
+ const bool noFrame)
{
logger->log("graphics backend: %s", getName().c_str());
logger->log("Setting video mode %dx%d %s",
w, h, fs ? "fullscreen" : "windowed");
- mWidth = w;
- mHeight = h;
mBpp = bpp;
mFullscreen = fs;
mHWAccel = hwaccel;
mEnableResize = resize;
mNoFrame = noFrame;
+ mActualWidth = w;
+ mActualHeight = h;
+ setScale(scale);
+}
+
+void Graphics::setScale(int scale)
+{
+ if (isAllowScale())
+ {
+ if (!scale)
+ scale = 1;
+ if (mActualWidth / scale < 470 || mActualHeight / scale < 320)
+ scale = 1;
+ logger->log("set scale: %d", scale);
+ mScale = scale;
+ mWidth = mActualWidth / mScale;
+ mHeight = mActualHeight / mScale;
+ }
+ else
+ {
+ mScale = 1;
+ mWidth = mActualWidth;
+ mHeight = mActualHeight;
+ }
+ mRect.w = mWidth;
+ mRect.h = mHeight;
}
int Graphics::getOpenGLFlags() const
@@ -161,7 +192,8 @@ bool Graphics::setOpenGLMode()
{
#ifdef USE_OPENGL
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
- if (!(mWindow = graphicsManager.createWindow(mWidth, mHeight,
+ if (!(mWindow = graphicsManager.createWindow(
+ mActualWidth, mActualHeight,
mBpp, getOpenGLFlags())))
{
mRect.w = 0;
@@ -173,15 +205,16 @@ bool Graphics::setOpenGLMode()
int w1 = 0;
int h1 = 0;
SDL_GetWindowSize(mWindow, &w1, &h1);
- mRect.w = w1;
- mRect.h = h1;
+ mRect.w = w1 / mScale;
+ mRect.h = h1 / mScale;
mGLContext = SDL_GL_CreateContext(mWindow);
#else // USE_SDL2
- mRect.w = static_cast<uint16_t>(mWindow->w);
- mRect.h = static_cast<uint16_t>(mWindow->h);
+ mRect.w = static_cast<uint16_t>(mWindow->w / mScale);
+ mRect.h = static_cast<uint16_t>(mWindow->h / mScale);
+
#endif // USE_SDL2
#ifdef __APPLE__
@@ -196,7 +229,7 @@ bool Graphics::setOpenGLMode()
graphicsManager.logVersion();
// Setup OpenGL
- glViewport(0, 0, mWidth, mHeight);
+ glViewport(0, 0, mActualWidth, mActualHeight);
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
int gotDoubleBuffer = 0;
SDL_GL_GetAttribute(SDL_GL_DOUBLEBUFFER, &gotDoubleBuffer);
@@ -374,22 +407,19 @@ bool Graphics::setFullscreen(const bool fs)
if (mFullscreen == fs)
return true;
- return setVideoMode(mWidth, mHeight, mBpp, fs, mHWAccel,
- mEnableResize, mNoFrame);
+ return setVideoMode(mActualWidth, mActualHeight, mScale, mBpp, fs,
+ mHWAccel, mEnableResize, mNoFrame);
}
bool Graphics::resizeScreen(const int width, const int height)
{
- if (mWidth == width && mHeight == height)
- return true;
-
#ifdef USE_SDL2
_endDraw();
- mRect.w = width;
- mRect.h = height;
- mWidth = width;
- mHeight = height;
+ mRect.w = width / mScale;
+ mRect.h = height / mScale;
+ mWidth = width / mScale;
+ mHeight = height / mScale;
#ifdef USE_OPENGL
// +++ probably this way will not work in windows/mac
@@ -409,14 +439,14 @@ bool Graphics::resizeScreen(const int width, const int height)
_endDraw();
- const bool success = setVideoMode(width, height, mBpp,
+ const bool success = setVideoMode(width, height, mScale, mBpp,
mFullscreen, mHWAccel, mEnableResize, mNoFrame);
// If it didn't work, try to restore the previous size. If that didn't
// work either, bail out (but then we're in deep trouble).
if (!success)
{
- if (!setVideoMode(prevWidth, prevHeight, mBpp,
+ if (!setVideoMode(prevWidth, prevHeight, mScale, mBpp,
mFullscreen, mHWAccel, mEnableResize, mNoFrame))
{
return false;
diff --git a/src/render/graphics.h b/src/render/graphics.h
index 82ef32fea..0cb510195 100644
--- a/src/render/graphics.h
+++ b/src/render/graphics.h
@@ -127,9 +127,13 @@ class Graphics : public gcn::Graphics
/**
* Try to create a window with the given settings.
*/
- virtual bool setVideoMode(const int w, const int h, const int bpp,
- const bool fs, const bool hwaccel,
- const bool resize, const bool noFrame) = 0;
+ virtual bool setVideoMode(const int w, const int h,
+ const int scale,
+ const int bpp,
+ const bool fs,
+ const bool hwaccel,
+ const bool resize,
+ const bool noFrame) = 0;
/**
* Set fullscreen mode.
@@ -341,8 +345,18 @@ class Graphics : public gcn::Graphics
virtual void completeCache() = 0;
+ int getScale() const
+ { return mScale; }
+
+ virtual bool isAllowScale() const
+ { return false; }
+
+ void setScale(int scale);
+
int mWidth;
int mHeight;
+ int mActualWidth;
+ int mActualHeight;
protected:
/**
@@ -350,9 +364,13 @@ class Graphics : public gcn::Graphics
*/
Graphics();
- void setMainFlags(const int w, const int h, const int bpp,
- const bool fs, const bool hwaccel,
- const bool resize, const bool noFrame);
+ void setMainFlags(const int w, const int h,
+ const int scale,
+ const int bpp,
+ const bool fs,
+ const bool hwaccel,
+ const bool resize,
+ const bool noFrame);
int getOpenGLFlags() const A_WARN_UNUSED;
@@ -386,6 +404,7 @@ class Graphics : public gcn::Graphics
std::string mName;
int mStartFreeMem;
bool mSync;
+ int mScale;
gcn::Color mColor;
gcn::Color mColor2;
};
diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index d273e9f65..82bf04dc8 100644
--- a/src/render/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -120,11 +120,14 @@ void MobileOpenGLGraphics::initArrays()
}
bool MobileOpenGLGraphics::setVideoMode(const int w, const int h,
- const int bpp, const bool fs,
- const bool hwaccel, const bool resize,
+ const int scale,
+ const int bpp,
+ const bool fs,
+ const bool hwaccel,
+ const bool resize,
const bool noFrame)
{
- setMainFlags(w, h, bpp, fs, hwaccel, resize, noFrame);
+ setMainFlags(w, h, scale, bpp, fs, hwaccel, resize, noFrame);
return setOpenGLMode();
}
@@ -842,10 +845,12 @@ void MobileOpenGLGraphics::_beginDraw()
#ifdef ANDROID
glOrthof(0.0, static_cast<float>(mRect.w),
- static_cast<float>(mRect.h), 0.0, -1.0, 1.0);
+ static_cast<float>(mRect.h),
+ 0.0, -1.0, 1.0);
#else
glOrtho(0.0, static_cast<double>(mRect.w),
- static_cast<double>(mRect.h), 0.0, -1.0, 1.0);
+ static_cast<double>(mRect.h),
+ 0.0, -1.0, 1.0);
#endif
glMatrixMode(GL_MODELVIEW);
@@ -969,9 +974,10 @@ bool MobileOpenGLGraphics::pushClipArea(gcn::Rectangle area)
glTranslatef(static_cast<GLfloat>(transX),
static_cast<GLfloat>(transY), 0);
}
- glScissor(clipArea.x, mRect.h - clipArea.y - clipArea.height,
- clipArea.width, clipArea.height);
-
+ glScissor(clipArea.x * mScale,
+ (mRect.h - clipArea.y - clipArea.height) * mScale,
+ clipArea.width * mScale,
+ clipArea.height * mScale);
return result;
}
@@ -997,8 +1003,10 @@ void MobileOpenGLGraphics::popClipArea()
glTranslatef(static_cast<GLfloat>(transX),
static_cast<GLfloat>(transY), 0);
}
- glScissor(clipArea.x, mRect.h - clipArea.y - clipArea.height,
- clipArea.width, clipArea.height);
+ glScissor(clipArea.x * mScale,
+ (mRect.h - clipArea.y - clipArea.height) * mScale,
+ clipArea.width * mScale,
+ clipArea.height * mScale);
}
#ifdef ANDROID
diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp
index 5b7abd895..e8e1a2116 100644
--- a/src/render/normalopenglgraphics.cpp
+++ b/src/render/normalopenglgraphics.cpp
@@ -140,11 +140,14 @@ void NormalOpenGLGraphics::initArrays()
}
bool NormalOpenGLGraphics::setVideoMode(const int w, const int h,
- const int bpp, const bool fs,
- const bool hwaccel, const bool resize,
+ const int scale,
+ const int bpp,
+ const bool fs,
+ const bool hwaccel,
+ const bool resize,
const bool noFrame)
{
- setMainFlags(w, h, bpp, fs, hwaccel, resize, noFrame);
+ setMainFlags(w, h, scale, bpp, fs, hwaccel, resize, noFrame);
return setOpenGLMode();
}
@@ -1103,10 +1106,12 @@ void NormalOpenGLGraphics::_beginDraw()
const int h = mRect.h;
#ifdef ANDROID
- glOrthof(0.0, static_cast<float>(w), static_cast<float>(h),
+ glOrthof(0.0, static_cast<float>(w),
+ static_cast<float>(h),
0.0, -1.0, 1.0);
#else
- glOrtho(0.0, static_cast<double>(w), static_cast<double>(h),
+ glOrtho(0.0, static_cast<double>(w),
+ static_cast<double>(h),
0.0, -1.0, 1.0);
#endif
@@ -1229,8 +1234,10 @@ bool NormalOpenGLGraphics::pushClipArea(gcn::Rectangle area)
glTranslatef(static_cast<GLfloat>(transX),
static_cast<GLfloat>(transY), 0);
}
- glScissor(clipArea.x, mRect.h - clipArea.y - clipArea.height,
- clipArea.width, clipArea.height);
+ glScissor(clipArea.x * mScale,
+ (mRect.h - clipArea.y - clipArea.height) * mScale,
+ clipArea.width * mScale,
+ clipArea.height * mScale);
return result;
}
@@ -1257,8 +1264,10 @@ void NormalOpenGLGraphics::popClipArea()
glTranslatef(static_cast<GLfloat>(transX),
static_cast<GLfloat>(transY), 0);
}
- glScissor(clipArea.x, mRect.h - clipArea.y - clipArea.height,
- clipArea.width, clipArea.height);
+ glScissor(clipArea.x * mScale,
+ (mRect.h - clipArea.y - clipArea.height) * mScale,
+ clipArea.width * mScale,
+ clipArea.height * mScale);
}
void NormalOpenGLGraphics::drawPoint(int x, int y)
diff --git a/src/render/nullopenglgraphics.cpp b/src/render/nullopenglgraphics.cpp
index 2f1a59976..3ea1e4182 100644
--- a/src/render/nullopenglgraphics.cpp
+++ b/src/render/nullopenglgraphics.cpp
@@ -83,11 +83,14 @@ void NullOpenGLGraphics::initArrays()
}
bool NullOpenGLGraphics::setVideoMode(const int w, const int h,
- const int bpp, const bool fs,
- const bool hwaccel, const bool resize,
+ const int scale,
+ const int bpp,
+ const bool fs,
+ const bool hwaccel,
+ const bool resize,
const bool noFrame)
{
- setMainFlags(w, h, bpp, fs, hwaccel, resize, noFrame);
+ setMainFlags(w, h, scale, bpp, fs, hwaccel, resize, noFrame);
return setOpenGLMode();
}
diff --git a/src/render/openglgraphicsdef.hpp b/src/render/openglgraphicsdef.hpp
index 9f6d9d319..89f8e63a9 100644
--- a/src/render/openglgraphicsdef.hpp
+++ b/src/render/openglgraphicsdef.hpp
@@ -21,6 +21,7 @@
*/
bool setVideoMode(const int w, const int h,
+ const int scalle,
const int bpp,
const bool fs,
const bool hwaccel,
@@ -141,6 +142,9 @@
void completeCache() override final;
+ bool isAllowScale() const override final
+ { return true; }
+
static void bindTexture(const GLenum target, const GLuint texture);
static GLuint mLastImage;
diff --git a/src/render/safeopenglgraphics.cpp b/src/render/safeopenglgraphics.cpp
index c6e8c1f30..bf9334655 100644
--- a/src/render/safeopenglgraphics.cpp
+++ b/src/render/safeopenglgraphics.cpp
@@ -53,11 +53,15 @@ SafeOpenGLGraphics::~SafeOpenGLGraphics()
{
}
-bool SafeOpenGLGraphics::setVideoMode(const int w, const int h, const int bpp,
- const bool fs, const bool hwaccel,
- const bool resize, const bool noFrame)
+bool SafeOpenGLGraphics::setVideoMode(const int w, const int h,
+ const int scale,
+ const int bpp,
+ const bool fs,
+ const bool hwaccel,
+ const bool resize,
+ const bool noFrame)
{
- setMainFlags(w, h, bpp, fs, hwaccel, resize, noFrame);
+ setMainFlags(w, h, scale, bpp, fs, hwaccel, resize, noFrame);
return setOpenGLMode();
}
@@ -436,7 +440,8 @@ void SafeOpenGLGraphics::_beginDraw()
glLoadIdentity();
glOrtho(0.0, static_cast<double>(mRect.w),
- static_cast<double>(mRect.h), 0.0, -1.0, 1.0);
+ static_cast<double>(mRect.h),
+ 0.0, -1.0, 1.0);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
@@ -537,9 +542,10 @@ bool SafeOpenGLGraphics::pushClipArea(gcn::Rectangle area)
glPushMatrix();
glTranslatef(static_cast<GLfloat>(transX + clipArea.xOffset),
static_cast<GLfloat>(transY + clipArea.yOffset), 0);
- glScissor(clipArea.x, mRect.h - clipArea.y - clipArea.height,
- clipArea.width, clipArea.height);
-
+ glScissor(clipArea.x * mScale,
+ (mRect.h - clipArea.y - clipArea.height) * mScale,
+ clipArea.width * mScale,
+ clipArea.height * mScale);
return result;
}
@@ -552,8 +558,10 @@ void SafeOpenGLGraphics::popClipArea()
glPopMatrix();
const gcn::ClipRectangle &clipArea = mClipStack.top();
- glScissor(clipArea.x, mRect.h - clipArea.y - clipArea.height,
- clipArea.width, clipArea.height);
+ glScissor(clipArea.x * mScale,
+ (mRect.h - clipArea.y - clipArea.height) * mScale,
+ clipArea.width * mScale,
+ clipArea.height * mScale);
}
void SafeOpenGLGraphics::drawPoint(int x, int y)
diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp
index 96e05c8f6..97f231d08 100644
--- a/src/render/sdl2graphics.cpp
+++ b/src/render/sdl2graphics.cpp
@@ -718,11 +718,15 @@ void SDLGraphics::drawLine(int x1, int y1, int x2, int y2)
SDL_RenderDrawLines(mRenderer, points, 2);
}
-bool SDLGraphics::setVideoMode(const int w, const int h, const int bpp,
- const bool fs, const bool hwaccel,
- const bool resize, const bool noFrame)
-{
- setMainFlags(w, h, bpp, fs, hwaccel, resize, noFrame);
+bool SDLGraphics::setVideoMode(const int w, const int h,
+ const int scale,
+ const int bpp,
+ const bool fs,
+ const bool hwaccel,
+ const bool resize,
+ const bool noFrame)
+{
+ setMainFlags(w, h, scale, bpp, fs, hwaccel, resize, noFrame);
if (!(mWindow = graphicsManager.createWindow(w, h, bpp,
getSoftwareFlags())))
diff --git a/src/render/sdl2graphics.h b/src/render/sdl2graphics.h
index 5f1e8ac1c..c4e0d74a7 100644
--- a/src/render/sdl2graphics.h
+++ b/src/render/sdl2graphics.h
@@ -129,6 +129,7 @@ class SDLGraphics final : public Graphics
void drawLine(int x1, int y1, int x2, int y2) override final;
bool setVideoMode(const int w, const int h,
+ const int scale,
const int bpp,
const bool fs,
const bool hwaccel,
diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp
index 95c8f08b1..088aba98c 100644
--- a/src/render/sdl2softwaregraphics.cpp
+++ b/src/render/sdl2softwaregraphics.cpp
@@ -1468,11 +1468,14 @@ void SDL2SoftwareGraphics::drawLine(int x1, int y1, int x2, int y2)
}
bool SDL2SoftwareGraphics::setVideoMode(const int w, const int h,
- const int bpp, const bool fs,
- const bool hwaccel, const bool resize,
+ const int scale,
+ const int bpp,
+ const bool fs,
+ const bool hwaccel,
+ const bool resize,
const bool noFrame)
{
- setMainFlags(w, h, bpp, fs, hwaccel, resize, noFrame);
+ setMainFlags(w, h, scale, bpp, fs, hwaccel, resize, noFrame);
if (!(mWindow = graphicsManager.createWindow(w, h, bpp,
getSoftwareFlags())))
diff --git a/src/render/sdl2softwaregraphics.h b/src/render/sdl2softwaregraphics.h
index 295118067..3ac6cb212 100644
--- a/src/render/sdl2softwaregraphics.h
+++ b/src/render/sdl2softwaregraphics.h
@@ -129,6 +129,7 @@ class SDL2SoftwareGraphics final : public Graphics
void drawLine(int x1, int y1, int x2, int y2) override final;
bool setVideoMode(const int w, const int h,
+ const int scale,
const int bpp,
const bool fs,
const bool hwaccel,
diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp
index 964f2d25a..e0e22cac9 100644
--- a/src/render/sdlgraphics.cpp
+++ b/src/render/sdlgraphics.cpp
@@ -1465,11 +1465,15 @@ void SDLGraphics::drawLine(int x1, int y1, int x2, int y2)
// other cases not implimented
}
-bool SDLGraphics::setVideoMode(const int w, const int h, const int bpp,
- const bool fs, const bool hwaccel,
- const bool resize, const bool noFrame)
+bool SDLGraphics::setVideoMode(const int w, const int h,
+ const int scale,
+ const int bpp,
+ const bool fs,
+ const bool hwaccel,
+ const bool resize,
+ const bool noFrame)
{
- setMainFlags(w, h, bpp, fs, hwaccel, resize, noFrame);
+ setMainFlags(w, h, scale, bpp, fs, hwaccel, resize, noFrame);
if (!(mWindow = graphicsManager.createWindow(w, h, bpp,
getSoftwareFlags())))
diff --git a/src/render/sdlgraphics.h b/src/render/sdlgraphics.h
index 53a139612..17b54db92 100644
--- a/src/render/sdlgraphics.h
+++ b/src/render/sdlgraphics.h
@@ -129,6 +129,7 @@ class SDLGraphics final : public Graphics
void drawLine(int x1, int y1, int x2, int y2) override final;
bool setVideoMode(const int w, const int h,
+ const int scale,
const int bpp,
const bool fs,
const bool hwaccel,
diff --git a/src/render/surfacegraphics.h b/src/render/surfacegraphics.h
index 3b0c639da..c3e6cb2ee 100644
--- a/src/render/surfacegraphics.h
+++ b/src/render/surfacegraphics.h
@@ -172,6 +172,7 @@ class SurfaceGraphics final : public Graphics
{ }
bool setVideoMode(const int w A_UNUSED, const int h A_UNUSED,
+ const int scale A_UNUSED,
const int bpp A_UNUSED,
const bool fs A_UNUSED, const bool hwaccel A_UNUSED,
const bool resize A_UNUSED,
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp
index 38c141d63..40ea7af1a 100644
--- a/src/resources/beinginfo.cpp
+++ b/src/resources/beinginfo.cpp
@@ -70,10 +70,13 @@ BeingInfo::BeingInfo() :
mMoveOffsetY(0),
mDeadOffsetX(0),
mDeadOffsetY(0),
+ mAttackOffsetX(0),
+ mAttackOffsetY(0),
mThinkTime(50),
mDirectionType(1),
mSitDirectionType(1),
mDeadDirectionType(1),
+ mAttackDirectionType(1),
mStaticMaxHP(false),
mTargetSelection(true)
{
diff --git a/src/resources/beinginfo.h b/src/resources/beinginfo.h
index d862f1020..31725d218 100644
--- a/src/resources/beinginfo.h
+++ b/src/resources/beinginfo.h
@@ -284,6 +284,18 @@ class BeingInfo final
int getDeadOffsetY() const A_WARN_UNUSED
{ return mDeadOffsetY; }
+ void setAttackOffsetX(const int n)
+ { mAttackOffsetX = n; }
+
+ int getAttackOffsetX() const A_WARN_UNUSED
+ { return mAttackOffsetX; }
+
+ void setAttackOffsetY(const int n)
+ { mAttackOffsetY = n; }
+
+ int getAttackOffsetY() const A_WARN_UNUSED
+ { return mAttackOffsetY; }
+
void setThinkTime(const int n)
{ mThinkTime = n; }
@@ -308,6 +320,12 @@ class BeingInfo final
int getDeadDirectionType() const A_WARN_UNUSED
{ return mDeadDirectionType; }
+ void setAttackDirectionType(const int n)
+ { mAttackDirectionType = n; }
+
+ int getAttackDirectionType() const A_WARN_UNUSED
+ { return mAttackDirectionType; }
+
void setColorsList(const std::string &name);
std::string getColor(const int idx) const A_WARN_UNUSED;
@@ -348,10 +366,13 @@ class BeingInfo final
int mMoveOffsetY;
int mDeadOffsetX;
int mDeadOffsetY;
+ int mAttackOffsetX;
+ int mAttackOffsetY;
int mThinkTime;
int mDirectionType;
int mSitDirectionType;
int mDeadDirectionType;
+ int mAttackDirectionType;
bool mStaticMaxHP;
bool mTargetSelection;
};
diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp
index 594bcce5d..97ea95aa0 100644
--- a/src/resources/db/emotedb.cpp
+++ b/src/resources/db/emotedb.cpp
@@ -49,6 +49,7 @@ void EmoteDB::load()
unknownSprite->sprite = AnimatedSprite::load(
paths.getStringValue("spriteErrorFile"));
unknownSprite->name = "unknown";
+ unknownSprite->id = 0;
mUnknown.sprites.push_back(unknownSprite);
logger->log1("Initializing emote database...");
@@ -122,6 +123,7 @@ void EmoteDB::loadXmlFile(const std::string &fileName)
XML::getProperty(spriteNode, "variant", 0));
currentSprite->name = XML::langProperty(
spriteNode, "name", "");
+ currentSprite->id = id;
currentInfo->sprites.push_back(currentSprite);
}
else if (xmlNameEqual(spriteNode, "particlefx"))
@@ -194,6 +196,7 @@ void EmoteDB::loadSpecialXmlFile(const std::string &fileName)
XML::getProperty(spriteNode, "variant", 0));
currentSprite->name = XML::langProperty(
spriteNode, "name", "");
+ currentSprite->id = id;
currentInfo->sprites.push_back(currentSprite);
}
else if (xmlNameEqual(spriteNode, "particlefx"))
diff --git a/src/resources/db/emotedb.h b/src/resources/db/emotedb.h
index f00bfbb47..02683a99a 100644
--- a/src/resources/db/emotedb.h
+++ b/src/resources/db/emotedb.h
@@ -35,12 +35,14 @@ struct EmoteSprite final
{
EmoteSprite() :
sprite(nullptr),
+ id(0),
name()
{ }
A_DELETE_COPY(EmoteSprite)
const AnimatedSprite *sprite;
+ int id;
std::string name;
};
diff --git a/src/resources/db/petdb.cpp b/src/resources/db/petdb.cpp
index c9f3bdbeb..7af3c5d09 100644
--- a/src/resources/db/petdb.cpp
+++ b/src/resources/db/petdb.cpp
@@ -132,6 +132,10 @@ void PETDB::loadXmlFile(const std::string &fileName)
"deadOffsetX", 0));
currentInfo->setDeadOffsetY(XML::getProperty(petNode,
"deadOffsetY", 1));
+ currentInfo->setAttackOffsetX(XML::getProperty(petNode,
+ "attackOffsetX", currentInfo->getTargetOffsetX()));
+ currentInfo->setAttackOffsetY(XML::getProperty(petNode,
+ "attackOffsetY", currentInfo->getTargetOffsetY()));
currentInfo->setThinkTime(XML::getProperty(petNode,
"thinkTime", 500) / 10);
@@ -142,6 +146,8 @@ void PETDB::loadXmlFile(const std::string &fileName)
"sitDirectionType", 1));
currentInfo->setDeadDirectionType(XML::getProperty(petNode,
"deadDirectionType", 1));
+ currentInfo->setAttackDirectionType(XML::getProperty(petNode,
+ "attackDirectionType", 4));
SpriteDisplay display;
for_each_xml_child_node(spriteNode, petNode)
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 6b87e6cdf..4cc7a4574 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -182,7 +182,7 @@ void ResourceManager::cleanUp(Resource *const res)
delete res;
#ifdef DEBUG_LEAKS
- cleanOrpahns(true);
+ cleanOrphans(true);
#endif
}
diff --git a/src/utils/copynpaste.cpp b/src/utils/copynpaste.cpp
index 4e4f3c183..9506332d0 100644
--- a/src/utils/copynpaste.cpp
+++ b/src/utils/copynpaste.cpp
@@ -441,14 +441,21 @@ static bool runxsel(std::string& text, const char *p1, const char *p2)
}
close(fd[0]);
}
+
+ const char *const xselPath =
+#if defined __OpenBSD__ || defined __FreeBSD__ || defined __DragonFly__
+ "/usr/local/bin/xsel";
+#else
+ "/usr/bin/xsel";
+#endif
if (p2)
{
- execl("/usr/bin/xsel", "xsel", p1, p2,
+ execl(xselPath, "xsel", p1, p2,
static_cast<char *>(nullptr));
}
else
{
- execl("/usr/bin/xsel", "xsel", p1,
+ execl(xselPath, "xsel", p1,
static_cast<char *>(nullptr));
}
diff --git a/src/utils/process.cpp b/src/utils/process.cpp
index bb7488e33..d05c6a11a 100644
--- a/src/utils/process.cpp
+++ b/src/utils/process.cpp
@@ -260,6 +260,12 @@ bool openBrowser(std::string url)
{
return execFile("/usr/bin/open", "/usr/bin/open", url, "");
}
+#elif defined __OpenBSD__ || defined __FreeBSD__ || defined __DragonFly__
+bool openBrowser(std::string url)
+{
+ return execFile("/usr/local/bin/xdg-open",
+ "/usr/local/bin/xdg-open", url, "");
+}
#elif defined __linux__ || defined __linux
bool openBrowser(std::string url)
{