Update translations.

author: Andrei Karas <akaras@inbox.ru> 2015-07-26 19:04:51 +0300
committer: Andrei Karas <akaras@inbox.ru> 2015-07-26 19:04:51 +0300
commit: d97569a88e332f682f3b668012b5ad502529d5bf (patch)
tree: 08c293f3d101d6efbeff290c28f4c9467084d96e
parent: 8c3d197dbdfc00969f30309ee7bf52656b33ed1b (diff)
download: manaverse-d97569a88e332f682f3b668012b5ad502529d5bf.tar.gz
manaverse-d97569a88e332f682f3b668012b5ad502529d5bf.tar.bz2
manaverse-d97569a88e332f682f3b668012b5ad502529d5bf.tar.xz
manaverse-d97569a88e332f682f3b668012b5ad502529d5bf.zip
21 files changed, 3798 insertions, 3318 deletions
diff --git a/po/ca.po b/po/ca.po
index 5d3c8a0fa..f822953a2 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-04-25 11:56+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/manaplus/"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr "Arxiu enviat"
 
@@ -34,8 +34,8 @@ msgstr "Arxiu enviat"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -45,7 +45,7 @@ msgstr "Arxiu enviat"
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -63,95 +63,95 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr "Memòria clau buidada"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Temps d'activitat del client: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "setmana %d"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr "%d setmanes"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "Dia %d"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr "%d dies"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "Hora %d"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr "%d hores"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "Minut %d"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuts"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "Segon  %d"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr "%d segons"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "Imatges de recurs:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "Imatges de recurs orfes:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr "Configuració enviada a:"
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr "Configuració de servidor enviada a:"
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr "Registre pujat a:"
 
@@ -298,12 +298,12 @@ msgid "Rename your pet"
 msgstr ""
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorant sol·licituds d'intercanvi"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "Acceptant sol·licituds d'intercanvi"
 
@@ -313,7 +313,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "Visible al mapa"
 
@@ -486,37 +486,37 @@ msgstr "Bombolla flotant"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configuració"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -534,7 +534,7 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -546,32 +546,32 @@ msgid "Close"
 msgstr "Tancar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "Connectant al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "Iniciant sessió"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "Entrant al mon de joc"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "Sol·licitant personatges"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "Connectant al servidor de joc"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "Canviant servidors de joc"
 
@@ -585,10 +585,10 @@ msgstr "Canviant servidors de joc"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -602,37 +602,37 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Sol·licitant detalls de registre"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "Canvi de contrasenya"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "Contrasenya canviada amb èxit!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "Canvi de correu"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "Correu canviat amb èxit!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "Registre anul·lat amb èxit"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "Adéu, torna quan vulguis..."
 
@@ -685,398 +685,415 @@ msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "Error al guardar la captura de pantalla!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr "S'ha perdut la connexió amb el servidor."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "Error de xarxa"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) Moviments per defecte"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(I) Invertir moviments"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) moure's amb alguns moviments boigs"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(c) Mou-te amb moviments boigs"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr "(d) doble normal + boig"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr "(?) moviment desconegut"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) moviment boig número %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) moviment boig personalitzat"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) moviment boig"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) moviment a objectiu per defecte"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) mou-te al objectiu a la distància 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr "(2) et mous a l'objectiu en distància 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr "(3) mou-te al objectiu a la distància 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr "(4) et mous a l'objectiu en distància 4"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr "(5) mou-te al objectiu a la distància 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr "(6) et mous a l'objectiu en distància 6"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr "(7) mou-te al objectiu a la distància 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr "(8) et mous a l'objectiu en distància 8"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr "(9) et mous a l'objectiu en distància 9"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr "(A) mou-te al objectiu a la distància d'atac"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr "(a) rang d'atac d'arquer"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) et mous a l'objectiu en rang d'atac - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?) mou-te al objectiu"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) seguiment per defecte"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) seguiment relatiu"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) seguiment tipus mirall"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) seguiment de mascota"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) seguiment desconegut"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) atac"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) atac per defecte"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) selecciona atac sense escut"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) selecciona atac amb escut"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) ves i ataca"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) ves, ataca i agafa"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) sense auto atac"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?) mou-te al objectiu"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) imitació"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) àrea de recollida petita 1x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) àrea de recollida per defecte 2x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) àrea àmplia de recollida 2x3"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) àrea de recollida 3x3"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) agafa a una distància de 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) agafa a una distància de 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr "(A) agafa a distància màxima"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) agafa"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Utilitza #flar per a atac màgic"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) utilitza #chiza per a atac màgic"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) utilitza #igrav per a atac màgic"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) utilitza #chiza per a atac màgic"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) utilitza #upmarmu per a atac màgic"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) atac màgic"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr "(D) imitació per defecte"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr "(O) imitació de vestimenta"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr "(?) imitació"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr "Els modificadors de joc estan activats"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr "Els modificadors de joc estan desactivats"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr "(N) Visualització de mapa normal"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr "(D) visualització de mapa \"depurador\""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr "(u) visualització de mapa ultra"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr "(U) visualització de mapa ultra 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr "(e) visualització de mapa buida amb col·lisió"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr "(b) visualització de mapa blanc i negre"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr "(O) al teclat"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr "(A) absent"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr "(?) absent"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "Lluny del teclat"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) mode càmera de joc"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) mode de càmera lliure"
 
@@ -1724,7 +1741,7 @@ msgstr "Parlar"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "Comprar"
@@ -1741,7 +1758,7 @@ msgstr "Comprar"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "Vendre"
 
@@ -2725,7 +2742,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "Sortir"
 
@@ -2738,7 +2755,7 @@ msgstr "Sortir"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2751,7 +2768,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2762,7 +2779,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "Max"
 
@@ -5570,7 +5587,7 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribueix %d punts"
@@ -5603,17 +5620,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "El nom ha de tenir com a mínim 4 caràcters."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "Estadístiques de personatge correctes"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "Has de treure %d punts"
@@ -6813,27 +6830,27 @@ msgstr "Actualitzant..."
 msgid "Connecting..."
 msgstr "Connectant..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 msgid "##1  The update process is incomplete."
 msgstr "##1 El procés d'actualització està incomplet."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:838
+#: src/gui/windows/updaterwindow.cpp:847
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Això es altament recomanat"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr "##1 tornes a provar més tard."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "Complet"
 
@@ -6987,86 +7004,92 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "Canviar tipus de moviment a Moviment d'Atac"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "Agafa"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "Canvia el mode de recollir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "Assentat"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "Captura de pantalla"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "Activa/Desactiva Intercanvis"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "Canviar mode de visionat de mapa"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "Selecciona OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index 3deed9b75..f45a1780f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
@@ -26,7 +26,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr "Soubor byl uploadován"
 
@@ -39,8 +39,8 @@ msgstr "Soubor byl uploadován"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -50,7 +50,7 @@ msgstr "Soubor byl uploadován"
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -68,95 +68,95 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr "Vyrovnávací paměť vyčištěna"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Doba běhu klienta: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "%d týdnů"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr "%d týdnů"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "%d dní"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr "%d dní"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "%d hodin"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr "%d hodin"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "%d minut"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "%d vteřinu"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr "%d vteřin"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "Resource images:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "Resource orphaned images:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr "Systémové proměnné uloženy"
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr "Nahráno nastavení do:"
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr "Nahráno nastavení serveru do:"
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr "Nahrány záznmy do:"
 
@@ -302,12 +302,12 @@ msgid "Rename your pet"
 msgstr ""
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorovat příchozí žádosti o obchodování"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "Akceptovat příchozí žádosti o obchodování"
 
@@ -317,7 +317,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "Viditelný na mapě"
 
@@ -491,37 +491,37 @@ msgstr "Plovoucí bublina"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Nastavení"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Výkon"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Téma"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr "O ManaPlus"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Nápověda"
@@ -539,7 +539,7 @@ msgstr "Nápověda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -551,32 +551,32 @@ msgid "Close"
 msgstr "Zavřít"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "Připojuji se k serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "Přihlašuji se"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "Vstupuji do herního světa"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "Vyžaduji postavy"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "Připojuji se k hernímu serveru"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "Vyměňuji herní servery"
 
@@ -590,10 +590,10 @@ msgstr "Vyměňuji herní servery"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -607,37 +607,37 @@ msgid "Error"
 msgstr "Chyba"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Požaduji registrační detaily"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "Změna hesla"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "Heslo úspěšně změněno!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "Změna emailu"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "Email úspěšně změněn!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "Zrušení registrace úspěšné"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "Nashledanou, vraťte se kdykoli..."
 
@@ -690,398 +690,415 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Snímek obrazovky uložen jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr "Spojení se serverem bylo ztraceno."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "Chyba sítě"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) výchozí pohyby"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(I) invertované pohyby"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) pohyby s trochou šílených pohybů"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(C) pohyby s šílenými pohyby"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr "(d) dvojité normální + šílené"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr "(?) neznámý pohyb"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) šílené pohyby číslo %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) vlastní šílené pohyby"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) šílené pohyby"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) výchozí pohyb k cíli"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) pohyb k cíli do vzdálenosti 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr "(2) pohyb k cíli do vzdálenosti 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr "(3) pohyb k cíli do vzdálenosti 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr "(4) pohyb k cíli do vzdálenosti 4"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr "(5) pohyb k cíli do vzdálenosti 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr "(6) pohyb k cíli do vzdálenosti 6"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr "(7) pohyb k cíli do vzdálenosti 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr "(8) pohyb k cíli do vzdálenosti 8"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr "(9) pohyb k cíli do vzdálenosti 9"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr "(A) pohyb k cíli na útočný dosah"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr "(a) dosah útoku lučštníka"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) jdi na útočnou vzdálenost -1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?) pohyb k cíli"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) výchozí následování"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) relativní následování"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) zrcadlené následování"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) následování mazlíčka"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) neznámé následování"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) útok"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) výchozí útok"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) přepínat útok bez štítu"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) přepínat útok se štítem"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) jdi a útoč"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) jdi, útoč, sbírej"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) bez automatického útoku"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?) pohyb k cíli"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) imitace"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) malý sběr 1x1 pole"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) výchozí sběr 2x1 pole"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) sběr přes 2x3 pole"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) sběr 3x3 pole"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) jdi a seber do vzdálenosti 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) jdi a seber do vzdálenosti 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr "(A) jdi a seber do max. vzdálenosti"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) sběr"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) použij #flar pro magický útok"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) použij #chiza pro magický útok"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) použij #ingrav pro magický útok"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) použij #frillyar pro magický útok"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) použij #upmarmu pro magický útok"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) magický útok attack"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr "(a) útoč na všecky hráče"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr "(f) útočit na všecky krom přátel"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr "(b) útoč na ty se špatnými vztahy"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr "(d) neútočit na hráče"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr "(?) útok hráče proti hráči"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr "(D) výchozí imitace"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr "(O) imitace výstroje"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr "(?) imitace"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr "Modifikátory hry jsou zapnuty"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr "Modifikátory hry jsou vypnuty"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr "Modifikátory hry nejsou známy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr "(N) Normální zobrazení mapy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr "(D) debug zobrazení mapy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr "(u) ultra zobrazení mapy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra zobrazení mapy 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr "(e) prázdná mapa s kolizní vrstvou"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr "(E) prázdná mapa"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr "(b) zobrazení černobílé mapy"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr "(?) zobrazení mapy"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr "(O) u počítače"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr "(A) pryč (away)"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr "(?) away"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "Pryč"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) mód herní kamery"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) mód volné kamery"
 
@@ -1730,7 +1747,7 @@ msgstr "Promluv"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "Nákup"
@@ -1747,7 +1764,7 @@ msgstr "Nákup"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "Prodej"
 
@@ -2732,7 +2749,7 @@ msgstr "Otevři web adresu"
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "Ukončit"
 
@@ -2745,7 +2762,7 @@ msgstr "Ukončit"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2758,7 +2775,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2769,7 +2786,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "Vše"
 
@@ -5582,7 +5599,7 @@ msgstr "^"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Rozdělte prosím %d bodů"
@@ -5615,17 +5632,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "Vaše jméno musí mít nejméně 4 znaky."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "Stav postavy je v pořádku"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "Odstraňte prosím %d bodů"
@@ -6836,27 +6853,27 @@ msgstr "Aktualizuje se..."
 msgid "Connecting..."
 msgstr "Připojuji se..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr "Zobrazit všecky novinky (může být pomalé)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 msgid "##1  The update process is incomplete."
 msgstr "##1  Proces aktualizace není kompletní."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:838
+#: src/gui/windows/updaterwindow.cpp:847
 msgid "##1  It is strongly recommended that"
 msgstr "##1  silně doporučujeme zkusit"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr "##1  aktualizaci později."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "Hotovo"
 
@@ -7010,86 +7027,92 @@ msgstr "Zaměř žoldáka"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "Změnit typ přesunu k cíli"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr "Zaměř mazlíčka"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr "Chytit mazlíčka"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr "Ostatní klávesy"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "Sebrat"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "Změnit typ sběru"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "Sednout si"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "Snímek obrazovky"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "Zapnout/Vypnout obchody"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr "Otevřít okno obchodu"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr "Zahájit obchod se zacíleným"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr "Následovat vybraného hráče"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "Změnit mód zobrazení mapy"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "Vybrat OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr "Zastavit nebo posadit se"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr "Návrat k bezpečnému video módu"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr "Vyhodít človíčka"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr "Otevřít kontextové okno"
 
diff --git a/po/de.po b/po/de.po
index b68d13c37..51a099dca 100644
--- a/po/de.po
+++ b/po/de.po
@@ -33,7 +33,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-05-25 01:33+0000\n"
 "Last-Translator: Suni <kristin.joris@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
@@ -45,7 +45,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr "Datei hochgeladen"
 
@@ -58,8 +58,8 @@ msgstr "Datei hochgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -69,7 +69,7 @@ msgstr "Datei hochgeladen"
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -87,95 +87,95 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr "Zwischenspeicher geleert"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client läuft seit: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "%d Wochen"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr "%d Wochen"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "%d Tage"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr "%d Tage"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "%d Stunden"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr "%d Stunden"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "%d Minuten"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr "%d Minuten"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "%d Sekunden"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "Bild-Quellen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "Quelle verwaister Bilddataien:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr "Umgebungsvariablen ausgegeben"
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr "Konfiguration hochgeladen zu:"
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr "Serverconfig hochgeladen zu:"
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr "Log hoch geladen zu:"
 
@@ -323,12 +323,12 @@ msgid "Rename your pet"
 msgstr "Dein Haustier umbennen"
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "Eingehende Handelsanfragen ignorieren"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "Eingehende Handelsanfragen akzeptieren"
 
@@ -338,7 +338,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "Auf der Karte sichtbar"
 
@@ -511,37 +511,37 @@ msgstr "Schwebende Blase"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Einstellungen"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Leistung"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Theme"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr "Über"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hilfe"
@@ -559,7 +559,7 @@ msgstr "Hilfe"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -571,32 +571,32 @@ msgid "Close"
 msgstr "Schließen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "Verbinde zum Server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "Anmelden"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "Spielfiguren werden abgefragt"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "Verbinde zum Spielserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "Spielserver wechseln"
 
@@ -610,10 +610,10 @@ msgstr "Spielserver wechseln"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -627,37 +627,37 @@ msgid "Error"
 msgstr "Fehler"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Anfrage der Registrierungsdetails"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "Passwort ändern"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "Erfolgreich abgemeldet."
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
@@ -710,398 +710,415 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Screenshot gespeichert unter %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "Screenshot konnte nicht gespeichert werden!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr "Die Verbindung zum Server wurde getrennt."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) Normale Bewegungen"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(I) Bewegungen umkehren"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Mit einigen verrückten Bewegungen bewegen"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(C) Mit verrückten Bewegungen bewegen"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr "(d) Doppelt normale + verrückte Bewegungen"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr "(?) Unbekannte Bewegung"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) Verrückte Bewegung Nummer %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) Benutzerdefinierte verrückte Bewegung"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) Verrückte Bewegung"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) Normal zum Ziel bewegen"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mit 1 Abstand zum Ziel bewegen"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr "(2) Mit 2 Abständen zum Ziel bewegen"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mit 3 Abständen zum Ziel bewegen"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr "(4) Mit 4 Abständen zum Ziel bewegen"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mit 5 Abständen zum Ziel bewegen"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr "(6) Mit 6 Abständen zum Ziel bewegen"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mit 7 Abständen zum Ziel bewegen"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr "(8) Mit 8 Abständen zum Ziel bewegen"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr "(9) Mit 9 Abständen zum Ziel bewegen"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr "(A) Zum Ziel in Angriffsreichweite bewegen"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr "(a) Fernkampf Angriffsreichweite"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) Zum Ziel in -1 Angriffsreichweite bewegen"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?) Zum Ziel bewegen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) Normales Folgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) Relatives Folgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) Gespiegeltes Folgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) Haustier folgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) Unbekanntes Folgen"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) Angriff"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) Normaler Angriff"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) Zu Angriff ohne Schild wechseln"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) Zu Angriff mit Schild wechseln"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) Bewegen und Angreifen"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) Bewegen, Angreifen, Aufheben"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) Ohne automatischen Angriff"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?) Zum Ziel bewegen"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) Imitation"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Klein: 1x1 Zellen aufheben"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Normal: 2x1 Zellen aufheben"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) 2x3 Zellen nach vorne aufheben"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) 3x3 Zellen aufheben"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Bis zu 4 Abstände bewegen und aufheben"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Bis zu 8 Abstände bewegen und aufheben"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Bis zum maximalen Abstand bewegen und aufheben"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) Aufheben"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) #flar als magischen Angriff benutzen"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) #chiza als magischen Angriff benutzen"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) #ingrav als magischen Angriff benutzen"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) #frillyar als magischen Angriff benutzen"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) #upmarmu als magischen Angriff benutzen"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) Magischer Angriff"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr "(a) Alle Spieler angreifen"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr "(f) Alle, außer Freunde, angreifen"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr "(b) Schlechte Beziehungen angreifen"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr "(d) Keine Spieler angreifen"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr "(?) PVP Angriff"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr "(D) Normale Imitation"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr "(O) Ausrüstungsets nachahmen"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr "(?) Imitation"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr "Spielmodifikatoren sind aktiviert"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr "Spielmodifikatoren sind deaktiviert"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr "Spielmodifikatoren sind unbekannt"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr "(N) Kartenansicht: Normal"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr "(D) Kartenansicht debuggen"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr "(u) Kartenansicht: Ultra"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr "(U) Kartenansicht: Ultra 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr "(e) Kartenansicht mit Kollision leeren"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr "(E) Kartenansicht leeren"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr "(b) Kartenansicht: Schwarz-weiß"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr "(?) Kartenansicht"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr "(O) Anwesend"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr "(A) Abwesend"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr "(?) Abwesend"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "Abwesend"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) Kameramodus: Spiel"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) Kameramodus: Frei"
 
@@ -1753,7 +1770,7 @@ msgstr "Sprechen"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "Kaufen"
@@ -1770,7 +1787,7 @@ msgstr "Kaufen"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "Verkaufen"
 
@@ -2756,7 +2773,7 @@ msgstr "URL öffnen"
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "Beenden"
 
@@ -2769,7 +2786,7 @@ msgstr "Beenden"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2782,7 +2799,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2793,7 +2810,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "Max"
 
@@ -5613,7 +5630,7 @@ msgstr "^"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Bitte verteile %d Punkte"
@@ -5646,17 +5663,17 @@ msgid "U"
 msgstr "U"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "Charakterattribute OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "Bitte entferne %d Punkte"
@@ -6867,27 +6884,27 @@ msgstr "Aktualisiere..."
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr "Alle Neuigkeiten anzeigen (Kann langsam sein)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 msgid "##1  The update process is incomplete."
 msgstr "##1 Updateprozess wurde nicht abgeschlossen."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:838
+#: src/gui/windows/updaterwindow.cpp:847
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Es wird dringend empfohlen, dass"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr "##1 du es später noch einmal versuchst."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "Fertig"
 
@@ -7041,86 +7058,92 @@ msgstr "Söldner anvisieren"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "Zum Ziel bewegen Typ ändern"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr "Haustier anvisieren"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr "Haustier fangen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr "Andere Tasten"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "Aufheben"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "Aufheben-Typ ändern"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "Sitzen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "Screenshot"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "Handeln erlauben/verbieten"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr "Handelsfenster öffnen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr "Handel mit Ziel starten"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr "Anvisierten Spieler folgen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "Kartenansichtsmodus ändern"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "OK auswählen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr "Stoppen oder Sitzen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr "Zum sicheren Videomodus zurückkehren"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr "Deinen Humunkulus feuern"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr "Kontextmenü öffnen"
 
diff --git a/po/es.po b/po/es.po
index 7bf2a1b7a..8b6aee5dd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-04-25 22:40+0000\n"
 "Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
@@ -33,7 +33,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr "Archivo subido"
 
@@ -46,8 +46,8 @@ msgstr "Archivo subido"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -57,7 +57,7 @@ msgstr "Archivo subido"
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -75,95 +75,95 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr "Caché limpiada"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "%d semanas"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr "%d semanas"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "%d días"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr "%d días"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "%d horas"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr "%d horas"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "%d minutos"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "%d segundos"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "Imágenes de recurso:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr "Variables de entorno vaciadas"
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr "Configuraciones subidas a:"
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr "Configuraciones del servidor subidas a:"
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr "Registro subido a:"
 
@@ -310,12 +310,12 @@ msgid "Rename your pet"
 msgstr "Renombrar tu mascota"
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando las peticiones de intercambio"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "Aceptando las peticiones de intercambio"
 
@@ -325,7 +325,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "Visibles en el mapa"
 
@@ -498,37 +498,37 @@ msgstr "Burbuja flotante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configuración"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Rendimiento"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr "Acerca de..."
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ayuda"
@@ -546,7 +546,7 @@ msgstr "Ayuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -558,32 +558,32 @@ msgid "Close"
 msgstr "Cerrar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "Cargando personajes"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "Cambiando servidores del juego"
 
@@ -597,10 +597,10 @@ msgstr "Cambiando servidores del juego"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -614,37 +614,37 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "¡Contraseña cambiada exitosamente!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "Cambio de Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "¡Email modificado exitosamente!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
@@ -697,398 +697,415 @@ msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de pantalla guardada como %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 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:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "Error de Red"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) moverse por defecto"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(I) moverse de forma invertida"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) moverse con algunos movimientos alocados"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(C) moverse con movimientos alocados"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr "(d) doble normal + loco"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr "(?) movimiento desconocido"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) movimiento loco número %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) movimiento loco personalizado"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) movimiento loco"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) moverse por defecto hacia el objetivo"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) moverse  al objetivo en distancia 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr "(2) moverse al objetivo en distancia 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr "(3) moverse al objetivo en distancia 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr "(4) se mueve al objetivo en distancia 4"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr "(5) moverse al objetivo en distancia 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr "(6) se mueve al objetivo en distancia 6"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr "(7) moverse al objetivo en distancia 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr "(8) se mueve al objetivo en distancia 8"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr "(9) se mueve al objetivo en distancia 9"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr "(A) moverse al objetivo en el rango de ataque"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr "(a) rango de ataque de arquero"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr "(b) moverse al blanco en rango de ataque - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?) moverse al objetivo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) seguimiento predeterminado"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) seguimiento relativo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) seguimiento tipo espejo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) seguir como mascota"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) seguimiento desconocido"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) ataque"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) ataque por defecto"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) intercambiar ataque sin escudo"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) intercambiar ataque con escudo"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) ir y atacar"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) ir, atacar, recoger"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) sin atacar automáticamente"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?) moverse al objetivo"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) imitación"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) recoger a 1x1 celdas (pequeño)"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) recoger a 2x1 celdas (predeterminado)"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) recoger hacia adelante a 2x3 celdas"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) recoger hasta 3x3 celdas"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) ir y recoger en distancia 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ir y recoger en distancia 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ir y recoger a máxima distancia"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) recoger"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) usar #flar para ataque mágico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) usar #chiza para ataque mágico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) usar #ingrav para ataque mágico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) usar #frillyar para ataque mágico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) usar #upmarmu para ataque mágico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) ataque mágico"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr "(a) atacar a todos los jugadores"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr "(f) atacar a todos, excepto a amigos"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr "(b) atacar a quienes están en malas relaciones"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr "(d) no atacar a los jugadores"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr "(?) ataque pvp"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr "(D) imitación predeterminada"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr "(O) imitación de vestimenta"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr "(?) imitación"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr "Modificadores del juego están habilitados"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr "Modificadores del juego están deshabilitados"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr "Los modificadores del juego son desconocidos"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr "(N) vista normal del mapa"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr "(D) vista de depuración del mapa"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr "(u) vista extremista del mapa"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr "(U) vista extremista 2 del mapa"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr "(e) vista de mapa vacío con colisiones"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr "(E) vista de mapa vacío"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr "(b) vista del mapa en blanco y negro"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr "(?) vista de mapa"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr "(O) en el teclado"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr "(A) lejos del teclado"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr "(?) afuera"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "Lejos del Teclado"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) modo de cámara de juego"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) modo de cámara libre"
 
@@ -1739,7 +1756,7 @@ msgstr "Hablar"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "Comprar"
@@ -1756,7 +1773,7 @@ msgstr "Comprar"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "Vender"
 
@@ -2742,7 +2759,7 @@ msgstr "Abrir url"
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "Salir"
 
@@ -2755,7 +2772,7 @@ msgstr "Salir"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2768,7 +2785,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2779,7 +2796,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "Máx"
 
@@ -5599,7 +5616,7 @@ msgstr "^"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor, distribuye %d puntos"
@@ -5632,17 +5649,17 @@ msgid "U"
 msgstr "D"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "Tu nombre debe tener como mínimo 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "Atributos del personaje OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor, borra %d puntos"
@@ -6856,27 +6873,27 @@ msgstr "Actualizando..."
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr "Mostrar todas las noticias (puede ser lento)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 msgid "##1  The update process is incomplete."
 msgstr "##1 El proceso de actualización está incompleto."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:838
+#: src/gui/windows/updaterwindow.cpp:847
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Se recomienda encarecidamente que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr "##1 lo intentes de nuevo más tarde."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "Completado"
 
@@ -7030,86 +7047,92 @@ msgstr "Apuntar a mercenario"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "Cambiar tipo de movimiento al objetivo"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr "Apuntar mascota"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr "Capturar mascota"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr "Otras Teclas"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "Recoger"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "Cambiar el tipo de recogida"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "Sentarse"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "Capturar pantalla"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Deshabilitar intercambios"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr "Abrir ventana de intercambio"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr "Iniciar intercambio con el objetivo"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr "Seguir al jugador seleccionado"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "Cambiar el modo de vista del mapa"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "Seleccionar OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr "Detener o sentar"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr "Volver a modo de video seguro"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr "Disparar con tu homúnculo"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr "Abrir menú contextual"
 
diff --git a/po/fi.po b/po/fi.po
index e56b9e826..6062050c1 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr ""
 
@@ -34,8 +34,8 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -45,7 +45,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -63,95 +63,95 @@ msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Ohjelma ollut käynnissä: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "%d viikkoa"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "%d päivää"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "%d tuntia"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "%d minuuttia"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "%d sekuntia"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "Resurssikuvat:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -297,12 +297,12 @@ msgid "Rename your pet"
 msgstr ""
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "Et huomioi kaupankäyntipyyntöjä"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "Hyväksyt kaupankäyntipyynnöt"
 
@@ -312,7 +312,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
@@ -485,37 +485,37 @@ msgstr "Leijuva puhekupla"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Asetukset"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Kuva"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Teema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Apua"
@@ -533,7 +533,7 @@ msgstr "Apua"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -545,32 +545,32 @@ msgid "Close"
 msgstr "Sulje"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
@@ -584,10 +584,10 @@ msgstr "Vaihdan pelipalvelinta"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -601,37 +601,37 @@ msgid "Error"
 msgstr "Virhe"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
@@ -684,398 +684,415 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) oletusliikkeet"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(I) käännetyt liikkeet"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) liikkuu osin villiliikkein"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(C) liikkuu villiliikkein"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr "(d) tuplaa tavallinen + villi"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr "(?) tuntematon liikkumistapa"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) oma villiliike"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) villiliike"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) oletussiirtymä kohteen luo"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) siirry kohteen luo etäisyydellä 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr "(2) siirry kohteen luo etäisyydellä 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr "(3) siirry kohteen luo etäisyydellä 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr "(5) siirry kohteen luo etäisyydellä 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr "(7) siirry kohteen luo etäisyydellä 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr "(a) jousiampujan hyökkäyskantama"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?) siirry kohteen luo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) oletusseuraaminen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) suhteellinen seuraaminen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) peilikuvaseuraaminen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) lemmikkiseuraaminen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) tuntematon seuraaminen"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) hyökkäys"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) oletushyökkäys"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) vaihda hyökkäystä, ei kilpeä"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) vaihda hyökkäystä, kilpi mukana"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) mene ja hyökkää"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) mene, hyökkää, poimi"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) ei automaattista hyökkäystä"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?) siirry kohteen luo"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) matkinta"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) pieni poiminta 1x1 ruutua"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) oletuspoiminta 2x1 ruutua"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) poiminta edestä 2x3 ruutua"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) poiminta 3x3 ruutua"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) mene ja poimi etäisyydellä 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) mene ja poimi etäisyydellä 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr "(A) mene ja poimi maksimietäisyydellä"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) poiminta"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) #flar taikahyökkäyksenä"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) #chiza taikahyökkäyksenä"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) #ingrav taikahyökkäyksenä"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) #frillyar taikahyökkäyksenä"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) #upmarmu taikahyökkäyksenä"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) taikahyökkäys"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr "(a) hyökkää kaikkien pelaajien kimppuun"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr "(b) hyökkää jos huonot suhteet"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr "(?) pelaajien kanssa taistelu"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr "(D) oletusmatkinta"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr "(O) asun matkinta"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr "(?) matkinta"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr "Pelimuokkaimet käytössä"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr "Pelimuokkaimet poissa käytöstä"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr "Pelimuokkaimet ovat tuntemattomia"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr "(N) normaali karttanäkymä"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr "(D) debug-karttanäkymä"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr "(u) ultra-karttanäkymä"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra-karttanäkymä 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr "(b) mustavalkoinen karttanäkymä"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr "(O) paikalla"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr "(A) poissa"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr "(?) poissaolo"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "Poissa"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) pelin kameratila"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) vapaa kamera"
 
@@ -1723,7 +1740,7 @@ msgstr "Keskustele"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "Osta"
@@ -1740,7 +1757,7 @@ msgstr "Osta"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "Myy"
 
@@ -2725,7 +2742,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "Sulje"
 
@@ -2738,7 +2755,7 @@ msgstr "Sulje"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2751,7 +2768,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2762,7 +2779,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "Max"
 
@@ -5566,7 +5583,7 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Jaa %d pistettä"
@@ -5599,17 +5616,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "Hahmon pistejako OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "%d pistettä liikaa, ole hyvä ja poista ylimäärä"
@@ -6810,27 +6827,27 @@ msgstr "Päivitetään..."
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 msgid "##1  The update process is incomplete."
 msgstr "##1  Päivitysprosessi keskeytyi."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:838
+#: src/gui/windows/updaterwindow.cpp:847
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Suosittelemme vahvasti että"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr "##1  yrität myöhemmin uudelleen."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "Valmis"
 
@@ -6984,86 +7001,92 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "Muuta kohteen luo liikkumisen tyyppiä"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr "Muut näppäimet"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "Poimi"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "Muuta poiminnan tyyppiä"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "Istu"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "Kuvankaappaus"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "Salli/estä kaupankäynti"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "Vaihda karttanäkymää"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "Valitse OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 10473657b..e1a1eb760 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-04-26 23:49+0000\n"
 "Last-Translator: Alige <aligetmw@hotmail.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
@@ -33,7 +33,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr "Fichier mis en ligne"
 
@@ -46,8 +46,8 @@ msgstr "Fichier mis en ligne"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -57,7 +57,7 @@ msgstr "Fichier mis en ligne"
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -75,95 +75,95 @@ msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr "Cache nettoyé"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Heure de lancement du client : %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "%d semaines"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr "%d semaines"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "%d jours"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr "%d jours"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "%d heures"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr "%d heures"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "%d minutes"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutes"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "%d secondes"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondes"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "Images des ressources :"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr "Variables d'environnement effacées"
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr "Config ajouté dans :"
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr "Config serveur ajouté dans :"
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr "Historique ajouté dans :"
 
@@ -312,12 +312,12 @@ msgid "Rename your pet"
 msgstr "Renommer ton familier"
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorer les requêtes d'échanges entrantes"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "Accepter les requêtes d'échanges entrantes"
 
@@ -327,7 +327,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
@@ -500,37 +500,37 @@ msgstr "Bulle flottante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configuration"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performance"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vidéo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Thème"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr "À propos"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Aide"
@@ -548,7 +548,7 @@ msgstr "Aide"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -560,32 +560,32 @@ msgid "Close"
 msgstr "Fermer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "Connexion"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "Entrée dans le monde de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
@@ -599,10 +599,10 @@ msgstr "Changement de serveur de jeu"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -616,37 +616,37 @@ msgid "Error"
 msgstr "Erreur"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "À bientôt, Revenez quand vous voulez..."
 
@@ -700,399 +700,416 @@ msgid "Debug"
 msgstr "Débogage"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Capture d'écran sauvegardée sous %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "La  capture d'écran a échoué !"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 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:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) Mouvements par défaut"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(I) Mouvements inversés"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) mouvements un peu fous"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(C) mouvements complètements fous"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr "(d) double normal et fou"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr "(?) déplacement inconnu"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) mouvement fou numéro %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) mouvements fous personnalisés"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) mouvements fous"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) Aller à la cible distante par défaut"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Aller à la cible distante de 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr "(2) Aller à la cible jusqu'à 2 de distance"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr "(3)  Aller à la cible distante de 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr "(4) se déplacer à la cible à distance 4"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr "(5)  Aller à la cible distante de 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr "(6) se déplacer à la cible à distance 6"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Aller à la cible distante de 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr "(8) se déplacer à la cible à distance 8"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr "(9) se déplacer à la cible à distance 9"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr "(A) Aller à la cible dans le champ d'attaque"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr "(a) Portée de l'attaque des archers"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) aller jusqu'à cible à portée - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?) aller à la cible"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) Suivre : défaut"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) Suivre: mouvement relatif"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) Suivre effet miroir"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) Suivre comme un familier"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) suivre : mode inconnu"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) attaque"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) Attaque : défaut"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) Attaquer sans bouclier"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) Attaquer avec bouclier"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) Se déplacer et attaquer"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) Se déplacer, attaquer et ramasser"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) Sans attaque automatique"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?) aller à la cible"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) imitation"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Ramassage sur 1x1 case"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Ramassage par défaut sur 2x1 cases"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Ramassage avant sur  2x3 cases"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Ramassage sur 3x3 cases"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Aller et ramasser jusqu'à 4 de distance"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Aller et ramasser jusqu'à 8 de distance"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Aller et ramasser jusqu'à la distance max"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) ramassage"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Utiliser #flar comme sort d'attaque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Utiliser #chiza comme sort d'attaque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Utiliser #ingrav comme sort d'attaque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Utiliser #frillyar comme sort d'attaque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Utiliser #upmarmu comme sort d'attaque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) sorts d'attaque"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr "(a) attaquer tous les joueurs"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr "(f) attaquer tous, sauf les amis"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr "(b) attaque les mauvaises relations"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr "(d) Ne pas attaquer les joueurs"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr "(?) attaque en PVP"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr "(D) Imitation par défaut"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr "(O) Imiter les équipements"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr "(?) imitation"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr "Modificateurs de mode de jeu activés"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr "Modificateurs de mode de jeu désactivés"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr "Les modificateurs de jeux sont inconnus"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr "(N) Vue normale du jeu"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr "(D) Vue du jeu mode déverminage"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr "(u) Vue du jeu mode Ultra 1"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr "(u) Vue du jeu mode Ultra 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr "(e) vider la vue de la carte avec des collisions"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr "(E) vider la vue de la carte"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr "(b) Vue de la carte en N&B"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr "(?) vue de la carte"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr "(O) Présent sur le jeu"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr "(A) Absent"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr "(?) absent"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "Inactif"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) Mode camera du jeu"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) Mode camera libre"
 
@@ -1744,7 +1761,7 @@ msgstr "Parler"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "Acheter"
@@ -1761,7 +1778,7 @@ msgstr "Acheter"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "Vendre"
 
@@ -2747,7 +2764,7 @@ msgstr "Ouvrir l'adresse"
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "Quitter"
 
@@ -2760,7 +2777,7 @@ msgstr "Quitter"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2773,7 +2790,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2784,7 +2801,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "Max."
 
@@ -5608,7 +5625,7 @@ msgstr "^"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribues %d points"
@@ -5641,17 +5658,17 @@ msgid "U"
 msgstr "I"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ton nom doit comporter un minimum de 4 caractères."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "Caractéristiques du personnage Ok"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "Retires %d points"
@@ -6866,27 +6883,27 @@ msgstr "Mise à jour en cours..."
 msgid "Connecting..."
 msgstr "Connexion..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr "Afficher toutes les nouvelles (peut être lent)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 msgid "##1  The update process is incomplete."
 msgstr "##1 Le processus de mise à jour n'est pas achevé."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:838
+#: src/gui/windows/updaterwindow.cpp:847
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Il est fortement recommandé de"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr "##1 Essayes de nouveau plus tard."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "Terminé"
 
@@ -7040,86 +7057,92 @@ msgstr "Cibler le mercenaire"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "Changer le type de déplacement vers les cibles"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr "Cibler le familier"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr "Attraper familier"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr "Autres touches"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "Ramasser"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "Changer le type de ramassage"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "S'asseoir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "Capture d'écran"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "Activer / Désactiver les échanges"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr "Ouvrir la fenêtre d'échanges"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr "Commencer l'échange avec la cible"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr "Suivre le joueur sélectionné"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "Changer le mode de vision de carte"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "Sélectionner OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr "S'arrêter et s’asseoir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr "Revenir au mode vidéo sécurisé"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr "Virer ton homoncule"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr "Ouvrir le menu contextuel"
 
diff --git a/po/id.po b/po/id.po
index 6c41e5e97..6763878f7 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
@@ -25,7 +25,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr "Data telah terunggah"
 
@@ -38,8 +38,8 @@ msgstr "Data telah terunggah"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -49,7 +49,7 @@ msgstr "Data telah terunggah"
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -67,95 +67,95 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr "Cache dibersihkan"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klien hidup: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "%d pekan"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr "%d pekan"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "%d hari"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr "%d hari"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "%d jam"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr "%d jam"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "%d menit"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr "%d menit"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "%d detik"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr "%d detik"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "Sumber gambar:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "Sumber gambar tak diketahui:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr "Variabel sekitar dibuang"
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr "Mengunggah setelan ke:"
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr "Mengunggah setelan server ke:"
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr "Mengunggah catatan ke:"
 
@@ -302,12 +302,12 @@ msgid "Rename your pet"
 msgstr ""
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "Abaikan permohonan transaksi"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "Terima permohonan transaksi"
 
@@ -317,7 +317,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "Terlihat di peta"
 
@@ -489,37 +489,37 @@ msgstr "Gelembung mengambang"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Pengaturan"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performa"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vidio"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr "Tentang"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Bantuan"
@@ -537,7 +537,7 @@ msgstr "Bantuan"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -549,32 +549,32 @@ msgid "Close"
 msgstr "Tutup"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "Terhubung ke server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "Masuk"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "Memasuki arena permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "Mengambil karakter"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "Terhubung ke server permainan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "Mengganti server"
 
@@ -588,10 +588,10 @@ msgstr "Mengganti server"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -605,37 +605,37 @@ msgid "Error"
 msgstr "Kesalahan"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Meminta detail registrasi"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "Perubahan Sandi"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "Perubahan sandi berhasil!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "Perubahan email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "Perubahan email berhasil!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "Telah tidak terdaftar"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "Selamat tinggal, datang kembali setiap saat..."
 
@@ -688,398 +688,415 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Tangkapan layar disimpan sebagai %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan tangkapan layar!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server hilang."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) gerakan dasar"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(I) gerakan terbalik"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) gerakan dengan beberapa gaya gila"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(C) gerakan dengan gaya gila"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr "(d) normal ganda + mode gila"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr "(?) gerak tidak diketahui"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) gerakan gila nomor %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) gerakan gila kustom"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) gerakan gila"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) gerakan dasar ke sasaran"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) bergerak ke sasaran pada jarak 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr "(2) jalan ke target di jarak 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr "(3) bergerak ke sasaran di jarak 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr "(4) bergerak ke sasaran di jarak 4"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr "(5) bergerak ke sasaran di jarak 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr "(6) bergerak ke sasaran di jarak 6"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr "(7) bergerak ke sasaran di jarak 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr "(8) bergerak ke sasaran di jarak 8"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr "(9) bergerak ke sasaran di jarak 9"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr "(A) bergerak ke target di jarak serang"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr "(a) jarak serangan pemanah"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) bergerak ke sasaran pada jarak serang - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?) bergerak ke target"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) mengikuti secara dasar"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) mengikuti secara relatif"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) mengikuti secara meniru"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) peliharaan mengikuti"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) mengikuti tidak diketahui"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?)serangan"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) pukulan dasar"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) ganti serangan tanpa pelindung"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) ganti serangan dengan pelindung"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) jalan dan serang"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) jalan, serang, ambil"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) tanpa penyerangan otomatis"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?) bergerak ke target"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) tiruan"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) pengambilan kecil 1x1 petak"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) pengambilan dasar 2x1 petak"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) pengambilan depan 2x3 petak"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) pengambilan 3x3 petak"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) maju dan mengambil di jarak 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) maju dan mengambil di jarak 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr "(A) maju dan mengambil di jarak maksimal"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) mengambil"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gunakan #flar untuk serangan magis"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gunakan #chiza untuk serangan magis"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(l) gunakan #ingrav untuk serangan magis"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gunakan #frillyar untuk serangan magis"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gunakan #upmarmu untuk serangan magis"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) serangan magis"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr "(a) serang semua pemain"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr "(f) serang semua kecuali teman"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr "(b) serang relasi buruk"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr "(d) jangan menyerang pemain"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr "(?) serangan pvp"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr "(D) tiruan dasar"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr "(O) tiruan pakaian"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr "(?) tiruan"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr "Perombak permainan dijalankan"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr "Perombak permainan tidak dijalankan"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr "Perombak permainan tidak diketahui"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr "(N) penampilan peta normal"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr "(D) tampilan peta mode debug"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr "(u) tampilan peta lebih"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr "(U) tampilan peta lebih 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr "(e) tampilan peta kosong dengan kolisi"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr "(E) tampilan peta kosong"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr "(b) penampilan peta hitam & putih"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr "(?) tampilan peta"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr "(O) pada keyboard"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr "(A) pergi"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr "(?) pergi"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "Pergi"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) mode kamera permainan"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) mode kamera bebas"
 
@@ -1728,7 +1745,7 @@ msgstr "Berbicara"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "Beli"
@@ -1745,7 +1762,7 @@ msgstr "Beli"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "Jual"
 
@@ -2730,7 +2747,7 @@ msgstr "Buka url"
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "Keluar"
 
@@ -2743,7 +2760,7 @@ msgstr "Keluar"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2756,7 +2773,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2767,7 +2784,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "Maks"
 
@@ -5568,7 +5585,7 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Tolong distribusikan %d point"
@@ -5601,17 +5618,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nama anda paling sedikit harus mengandung 4 karakter."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "Stats Karakter OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "Tolong hilangkan %d poin"
@@ -6812,27 +6829,27 @@ msgstr "Mengupdate..."
 msgid "Connecting..."
 msgstr "Menyambung..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:838
+#: src/gui/windows/updaterwindow.cpp:847
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr ""
 
@@ -6986,86 +7003,92 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "Mengubah ke OpenGL"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 46d17034c..d7f4c6504 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
@@ -30,7 +30,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr "File caricato"
 
@@ -43,8 +43,8 @@ msgstr "File caricato"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -54,7 +54,7 @@ msgstr "File caricato"
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -72,95 +72,95 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr "Cache puliti"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tempo online: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "%d settimane"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr "%d settimane"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "%d giorni"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr "%d giorni"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "%d ore"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr "%d ore"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "%d minuti"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuti"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "%d secondi"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondi"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "Risorsa immagine:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "Risorsa immagine orfana:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr "Variabile d'ambiente dumping"
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr "Carica configurazione in:"
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr "Carica configurazione server in:"
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr "Carica log in:"
 
@@ -307,12 +307,12 @@ msgid "Rename your pet"
 msgstr ""
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno ignorate"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
@@ -322,7 +322,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "Visibile nella mappa"
 
@@ -495,37 +495,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Impostazioni"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Aiuto"
@@ -543,7 +543,7 @@ msgstr "Aiuto"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -555,32 +555,32 @@ msgid "Close"
 msgstr "Chiudi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "Accesso all'account"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "Caricamento personaggi"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
@@ -594,10 +594,10 @@ msgstr "Cambiamento server del gioco"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -611,37 +611,37 @@ msgid "Error"
 msgstr "Errore"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "Cambia password"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "Cambia Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
@@ -694,398 +694,415 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio immagine fallito!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è caduta."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "Errore di rete"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) Modalita' movimento standard"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(I) Modalita' movimento invertita"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Modalita' movimento casuale"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(C) Modalita' movimento casuale, estesa"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) Modalita' movimento casuale, personalizzata"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) Movimento casuale"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) spostati fino all'obbiettivo, default"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) spostati fino all'obbiettivo, distanza 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr "(3) spostati fino all'obbiettivo, distanza 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr "(5) spostati fino all'obbiettivo, distanza 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr "(7) spostati fino all'obbiettivo, distanza 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?) spostati fino all'obbiettivo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) Modalita' Segui, default"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) Modalita' Segui, relativa"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) Modalita' Segui, specchio"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) Modalita' Segui, pet"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) Modalita' Segui, sconosciuta"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) attacco"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) Attacco default"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) Cambia ad Attacco senza scudo"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) Cambia ad Attacco con scudo"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) Muovi e attacca"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) Muovi, attacca e raccogli"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) Disattiva Attacco automatico"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?) spostati fino all'obbiettivo"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) spostati fino all'obbiettivo"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) Raccogli"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) usa #flar come attacco magico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) usa #chiza come attacco magico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) usa #ingrav come attacco magico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) usa #frillyar come attacco magico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) usa #upmarmu come attacco magico"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) attacco magico"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr "(a) Attacca tutti i giocatori"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr "(f) Attacca tutti eccetto amici"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr "(b) Attacca cattive relazioni"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr "(d) Non attaccare giocatori"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr "(?) Attacco PVP"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "Assente"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) Modalita' camera gioco"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) Modalita' camera libera"
 
@@ -1736,7 +1753,7 @@ msgstr "Parla"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "Compra"
@@ -1753,7 +1770,7 @@ msgstr "Compra"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "Vendi"
 
@@ -2738,7 +2755,7 @@ msgstr "Apri url"
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "Esci"
 
@@ -2751,7 +2768,7 @@ msgstr "Esci"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2764,7 +2781,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2775,7 +2792,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "Massimo"
 
@@ -5584,7 +5601,7 @@ msgstr "^"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Distribuire %d punti"
@@ -5617,17 +5634,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "Il tuo nome deve contenere almeno 4 caratteri."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "Statistiche personaggio OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "Rimuovere %d punti"
@@ -6832,27 +6849,27 @@ msgstr "Aggiornamento..."
 msgid "Connecting..."
 msgstr "Connessione..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 msgid "##1  The update process is incomplete."
 msgstr "##1 L'aggiornamento è stato completato."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:838
+#: src/gui/windows/updaterwindow.cpp:847
 msgid "##1  It is strongly recommended that"
 msgstr "##1 È fortemente raccomandato"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr "##1  riprova più tardi."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "Completato"
 
@@ -7006,86 +7023,92 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "Cambia mossa speciale"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "Raccogli"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "Cambia modo di raccogliere"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "Siediti"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "Screenshot"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "Abilita/Disabilita Scambi"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "Cambia visualiz. mappa"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "Seleziona OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr "Fermati o siediti"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr "Ritorna alla modalità video sicura"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index fe7508cc7..322158fed 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
@@ -26,7 +26,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr ""
 
@@ -39,8 +39,8 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -50,7 +50,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -68,95 +68,95 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "クライアントの稼働時間: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "%d週"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "%d日"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "%d時"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "%d分"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "%d秒"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "リソースイメージ:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "リソース孤児イメージ:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -302,12 +302,12 @@ msgid "Rename your pet"
 msgstr ""
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "トレードリクエストを無効にしています"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "トレードリクエストを有効にしました"
 
@@ -317,7 +317,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "マップに表示させる"
 
@@ -489,37 +489,37 @@ msgstr "吹出し"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "設定"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "ビデオ"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "テーマ"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "ヘルプ"
@@ -537,7 +537,7 @@ msgstr "ヘルプ"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -549,32 +549,32 @@ msgid "Close"
 msgstr "閉じる"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "サーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "ログインしています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "ゲームの世界に移動しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "キャラクターを呼び出しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "ゲームサーバーに接続しています"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "ゲームサーバーを変更しています"
 
@@ -588,10 +588,10 @@ msgstr "ゲームサーバーを変更しています"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -605,37 +605,37 @@ msgid "Error"
 msgstr "エラー"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "登録内容を呼び出しています"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "パスワード変更"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "パスワードを変更しました!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "メールアドレス変更"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "メールアドレスを変更しました!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "登録を解除しました"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "さようなら　また会いましょう..."
 
@@ -688,398 +688,415 @@ msgid "Debug"
 msgstr "デバッグ"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存できませんでした!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr "サーバーへの接続が切断されました."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) デフォルトムーブ"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(I) 逆ムーブ"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) クレイジームーブを含んだムーブ"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(C) クレイジームーブ"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr "(d) ダブルノーマル + クレイジー"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr "(?) 不明なムーブ"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) カスタムクレイジームーブ"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) クレイジームーブ"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) ターゲットへデフォルト接近"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) 距離1でターゲットへ接近"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr "(2) 距離2でターゲットに近付く"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr "(3) 距離3でターゲットへ接近"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr "(5) 距離5でターゲットに近付く"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr "(7) 距離7でターゲットに近付く"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr "(A) 攻撃範囲内のターゲットに近付く"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr "(a) 弓師攻撃範囲"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) 攻撃範囲 - 1のターゲットまで移動"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?) ターゲットに近付く"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) デフォルトフォロー"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) 友達フォロー"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) ミラーフォロー"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) ペットフォロー"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) 不明なフォロー"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) 攻撃"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) デフォルト攻撃"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) 盾なし攻撃"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) 盾あり攻撃"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) 接近、攻撃"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) 接近、攻撃、拾う"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) 自動攻撃なし"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?) ターゲットに近付く"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) 真似をする"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) 小範囲で拾う 1x1セル"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) デフォルト範囲で拾う 2x1セル"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) 広範囲で拾う 2x3セル"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) 3x3セルの範囲で拾う"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) 距離4の範囲で拾う"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) 距離8で拾う"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr "(A) 最大範囲で拾う"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) 拾う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) 魔法攻撃は #flarを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) 魔法攻撃は #chizaを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) 魔法攻撃は #ingravを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) 魔法攻撃は #frillyarを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) 魔法攻撃は #upmarmuを使う"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) 魔法攻撃"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr "(a) 全てのプレイヤーを攻撃"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr "(f) 友達以外を攻撃"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr "(b) 敵を攻撃"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr "(d) 他のプレイヤーを攻撃しない"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr "(?) PvP攻撃"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr "(D) デフォルト真似"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr "(O) 服装真似"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr "(?) 真似をする"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr "ゲームモディファイアは有効になってます"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr "ゲームモディファイアは無効になってます"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr "不明なゲームモディファイア"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr "(N) 通常マップビュー"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr "(D) デバッグマップビュー"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr "(u) ウルトラマップビュー"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr "(U) ウルトラマップビュー2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr "(b) 白黒マップビュー"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr "(O) キーボード"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr "(A) アウェイ"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr "(?) アウェイ"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "アウェイ"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) ゲームカメラモード"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) フリーカメラモード"
 
@@ -1727,7 +1744,7 @@ msgstr "話す"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "買う"
@@ -1744,7 +1761,7 @@ msgstr "買う"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "売る"
 
@@ -2729,7 +2746,7 @@ msgstr "URLを開く"
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "終了"
 
@@ -2742,7 +2759,7 @@ msgstr "終了"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2755,7 +2772,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2766,7 +2783,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "最大"
 
@@ -5569,7 +5586,7 @@ msgstr "^"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "%d ポイントを振り分けてください"
@@ -5602,17 +5619,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "名前は４文字以上必要です."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "能力ポイント配分量は問題ありません"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "%dポイントを取り除いてください"
@@ -6815,27 +6832,27 @@ msgstr "更新しています..."
 msgid "Connecting..."
 msgstr "接続しています..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 msgid "##1  The update process is incomplete."
 msgstr "##1  アップデートは完了していません."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:838
+#: src/gui/windows/updaterwindow.cpp:847
 msgid "##1  It is strongly recommended that"
 msgstr "##1 する事を強く推奨します"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr "##1  しばらくたってからもう一度試してください."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "完了"
 
@@ -6989,86 +7006,92 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "ターゲットへ接近方法変更"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr "その他のキー"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "拾う"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "拾い方を変更"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "座る"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "スクリーンショット"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "取引を有効/無効にする"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "マップビューモード変更"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "OKを選択する"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr "止まる・座る"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr "セーフビデオモードへ戻る"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr ""
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 67b0b6641..6ff1297dc 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: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+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"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr ""
 
@@ -32,8 +32,8 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -43,7 +43,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -61,95 +61,95 @@ msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -295,12 +295,12 @@ msgid "Rename your pet"
 msgstr ""
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr ""
 
@@ -310,7 +310,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr ""
 
@@ -483,37 +483,37 @@ msgstr ""
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr ""
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr ""
@@ -531,7 +531,7 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -543,32 +543,32 @@ msgid "Close"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr ""
 
@@ -582,10 +582,10 @@ msgstr ""
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -599,37 +599,37 @@ msgid "Error"
 msgstr ""
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr ""
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr ""
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr ""
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr ""
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr ""
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr ""
 
@@ -682,398 +682,413 @@ msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr ""
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+msgid "(D) don't switch target"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+msgid "(?) targeting"
+msgstr ""
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr ""
 
@@ -1721,7 +1736,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr ""
@@ -1738,7 +1753,7 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr ""
 
@@ -2719,7 +2734,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr ""
 
@@ -2732,7 +2747,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr ""
 
@@ -2745,7 +2760,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr ""
 
@@ -2756,7 +2771,7 @@ msgstr ""
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr ""
 
@@ -5556,7 +5571,7 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
@@ -5589,17 +5604,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr ""
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
@@ -6792,27 +6807,27 @@ msgstr ""
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:838
+#: src/gui/windows/updaterwindow.cpp:847
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr ""
 
@@ -6966,86 +6981,91 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
-msgid "Target pet"
+msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:142
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:148
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:154
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:160
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:166
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:172
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:178
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:184
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:190
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:196
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:202
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:208
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index a84366e4f..cc385e231 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr "Bestand is opgeladen"
 
@@ -36,8 +36,8 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -47,7 +47,7 @@ msgstr "Bestand is opgeladen"
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -65,95 +65,95 @@ msgstr "Oké"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr "Cache gewist"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "%d weken"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr "%d weken"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "%d dagen"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr "%d dagen"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "%d uren"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr "%d uren"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "%d minuten"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuten"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "%d seconden"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "Bron afbeeldingen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "Bron verweesde afbeeldingen:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr "Omgevingsvariabelen gedumpt"
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr "Configuratie opgeladen in:"
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr "Log opgeladen in:"
 
@@ -299,12 +299,12 @@ msgid "Rename your pet"
 msgstr ""
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
@@ -314,7 +314,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
@@ -487,37 +487,37 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performantie"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr "Over"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Help"
@@ -535,7 +535,7 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -547,32 +547,32 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
@@ -586,10 +586,10 @@ msgstr "Wijzigen spelservers"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -603,37 +603,37 @@ msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
@@ -686,398 +686,415 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Schermafdruk opgeslagen als %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "Netwerkfout"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) standaard bewegingen"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(I) geïnverteerde bewegingen"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) bewegingen met enkele vreemde bewegingen"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(C) bewegingen met vreemde bewegingen"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr "(d) dubbel normaal + raar"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr "(?) onbekende verplaatsing"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) manuele vreemde beweging"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) vreemde beweging"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) standaard bewegingen tot aan doel"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) bewegen tot aan doel in bereik 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr "(2) bewegen tot aan doel in bereik 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr "(3) bewegen tot aan doel in bereik 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr "(5) bewegen tot aan doel in bereik 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr "(7) bewegen tot aan doel in bereik 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr "(A) beweeg tot aan doel in aanvalsbereik"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?) beweeg tot aan doel"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) standaard volgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) relatief volgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) gespiegeld volgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) huisdier volgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) onbekend volgen"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) aanval"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) standaard aanval"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) wissel aanval zonder schild"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) wissel aanval met schild"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) ga en val aan"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) ga, val aan, raap op"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) zonder auto aanval"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?) beweeg tot aan doel"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) imitatie"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) klein raap op 1x1 velden"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) standaard raap op 2x1 velden"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) vooruit raap op 2x3 velden"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) raap op 3x3 velden"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) go en raap op met bereik 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ga en raap op met bereik 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ga en raap op zonder bereiklimiet"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) raap op"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gebruik #flar voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gebruik #chiza voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) gebruik #ingrav voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gebruik #frillyar voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gebruik #upmarmu voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) magie aanval"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr "(D) standaard imitatie"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr "(O) kleren imitatie"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr "(?) imitatie"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr "(N) normale map tonen"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr "(D) debug map tonen"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr "(u) ultra map tonen"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra map tonen 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr "(b) zwart & witte map tonen"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr "(O) op toetsenbord"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr "(A) weg"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr "(?) weg"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "Weg"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) spel camera modus"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) vrije camera modus"
 
@@ -1727,7 +1744,7 @@ msgstr "Spreken"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "Kopen"
@@ -1744,7 +1761,7 @@ msgstr "Kopen"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "Verkopen"
 
@@ -2728,7 +2745,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -2741,7 +2758,7 @@ msgstr "Afsluiten"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2754,7 +2771,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2765,7 +2782,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "Maximum"
 
@@ -5572,7 +5589,7 @@ msgstr "^"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
@@ -5605,17 +5622,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -6818,27 +6835,27 @@ msgstr "Actualiseren..."
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 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:838
+#: src/gui/windows/updaterwindow.cpp:847
 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:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr "##1  probeer later opnieuw."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -6992,86 +7009,92 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "Wijzig Bewegen tot aan Doel type"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "Oprapen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "Verander Opraap Type"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "Zitten"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "Handelen inschakelen/uitschakelen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "Wijzig Map Tonen Modus"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "OK selecteren"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr "Stop of zit"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index a84366e4f..cc385e231 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr "Bestand is opgeladen"
 
@@ -36,8 +36,8 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -47,7 +47,7 @@ msgstr "Bestand is opgeladen"
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -65,95 +65,95 @@ msgstr "Oké"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr "Cache gewist"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "%d weken"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr "%d weken"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "%d dagen"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr "%d dagen"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "%d uren"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr "%d uren"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "%d minuten"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuten"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "%d seconden"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "Bron afbeeldingen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "Bron verweesde afbeeldingen:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr "Omgevingsvariabelen gedumpt"
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr "Configuratie opgeladen in:"
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr "Log opgeladen in:"
 
@@ -299,12 +299,12 @@ msgid "Rename your pet"
 msgstr ""
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "Inkomende handelsaanvragen negeren"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "Inkomende handelsaanvragen accepteren"
 
@@ -314,7 +314,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
@@ -487,37 +487,37 @@ msgstr "Zwevende bel"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configureren"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performantie"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Thema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr "Over"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Help"
@@ -535,7 +535,7 @@ msgstr "Help"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -547,32 +547,32 @@ msgid "Close"
 msgstr "Sluiten"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "Inloggen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
@@ -586,10 +586,10 @@ msgstr "Wijzigen spelservers"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -603,37 +603,37 @@ msgid "Error"
 msgstr "Fout"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "Email Wijziging"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
@@ -686,398 +686,415 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Schermafdruk opgeslagen als %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "Netwerkfout"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) standaard bewegingen"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(I) geïnverteerde bewegingen"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) bewegingen met enkele vreemde bewegingen"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(C) bewegingen met vreemde bewegingen"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr "(d) dubbel normaal + raar"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr "(?) onbekende verplaatsing"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) manuele vreemde beweging"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) vreemde beweging"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) standaard bewegingen tot aan doel"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) bewegen tot aan doel in bereik 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr "(2) bewegen tot aan doel in bereik 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr "(3) bewegen tot aan doel in bereik 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr "(5) bewegen tot aan doel in bereik 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr "(7) bewegen tot aan doel in bereik 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr "(A) beweeg tot aan doel in aanvalsbereik"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?) beweeg tot aan doel"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) standaard volgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) relatief volgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) gespiegeld volgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) huisdier volgen"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) onbekend volgen"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) aanval"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) standaard aanval"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) wissel aanval zonder schild"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) wissel aanval met schild"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) ga en val aan"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) ga, val aan, raap op"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) zonder auto aanval"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?) beweeg tot aan doel"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) imitatie"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) klein raap op 1x1 velden"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) standaard raap op 2x1 velden"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) vooruit raap op 2x3 velden"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) raap op 3x3 velden"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) go en raap op met bereik 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ga en raap op met bereik 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ga en raap op zonder bereiklimiet"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) raap op"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gebruik #flar voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gebruik #chiza voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) gebruik #ingrav voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gebruik #frillyar voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gebruik #upmarmu voor magie aanval"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) magie aanval"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr "(D) standaard imitatie"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr "(O) kleren imitatie"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr "(?) imitatie"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr "(N) normale map tonen"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr "(D) debug map tonen"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr "(u) ultra map tonen"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra map tonen 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr "(b) zwart & witte map tonen"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr "(O) op toetsenbord"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr "(A) weg"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr "(?) weg"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "Weg"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) spel camera modus"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) vrije camera modus"
 
@@ -1727,7 +1744,7 @@ msgstr "Spreken"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "Kopen"
@@ -1744,7 +1761,7 @@ msgstr "Kopen"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "Verkopen"
 
@@ -2728,7 +2745,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -2741,7 +2758,7 @@ msgstr "Afsluiten"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2754,7 +2771,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2765,7 +2782,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "Maximum"
 
@@ -5572,7 +5589,7 @@ msgstr "^"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Nog %d punten te verdelen"
@@ -5605,17 +5622,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "Je naam moet uit tenminste 4 tekens bestaan."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "Attributen van personage OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "Verwijder alstublieft %d punten"
@@ -6818,27 +6835,27 @@ msgstr "Actualiseren..."
 msgid "Connecting..."
 msgstr "Verbinden..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 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:838
+#: src/gui/windows/updaterwindow.cpp:847
 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:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr "##1  probeer later opnieuw."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "Voltooid"
 
@@ -6992,86 +7009,92 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "Wijzig Bewegen tot aan Doel type"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "Oprapen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "Verander Opraap Type"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "Zitten"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "Handelen inschakelen/uitschakelen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "Wijzig Map Tonen Modus"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "OK selecteren"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr "Stop of zit"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 18a023ffe..1574272df 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
@@ -27,7 +27,7 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr "Plik wysłano"
 
@@ -40,8 +40,8 @@ msgstr "Plik wysłano"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -51,7 +51,7 @@ msgstr "Plik wysłano"
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -69,95 +69,95 @@ msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr "Cache opróżnione"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Czas pracy programu: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "%d tygodni/e"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr "%d tygodni/e"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "%d dni"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr "%d dni"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "%d godzin/y"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr "%d godzin/y"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "%d minut/y"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut/y"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "%d sekund/y"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund/y"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "Obrazy źródłowe:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "Osierocone obrazy źródłowe:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr "Zmienne środowiskowe zostały zrzucone"
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr "Załaduj ustawienia do:"
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr "Załaduj ustawienia serwera do:"
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr "Załaduj log do:"
 
@@ -303,12 +303,12 @@ msgid "Rename your pet"
 msgstr ""
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorowanie przychodzących próśb o handel"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "Akceptowanie przychodzących próśb o handel"
 
@@ -318,7 +318,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "Widoczne na mapie"
 
@@ -492,37 +492,37 @@ msgstr "Bąbelek nad głową"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Konfiguracja"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Wydajność"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Ekran"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Skórka"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr "O..."
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Pomoc"
@@ -540,7 +540,7 @@ msgstr "Pomoc"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -552,32 +552,32 @@ msgid "Close"
 msgstr "Zamknij"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "Logowanie"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "Wchodzenie do świata gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "Sprawdzanie postaci"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "Łączenie się z serwerem gry"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "Zmiana serwera"
 
@@ -591,10 +591,10 @@ msgstr "Zmiana serwera"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -608,37 +608,37 @@ msgid "Error"
 msgstr "Błąd"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Sprawdzanie szczegółów rejestracji"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "Zmiana hasła"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "Hasło zmienione z powodzeniem!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "Zmiana adresu e-mail"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "Adres e-mail zmieniony z powodzeniem!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "Wyrejestrowano z powodzeniem"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "Żegnaj, będziemy czekać na Twój powrót..."
 
@@ -691,398 +691,415 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Zrzut ekranu zapisany jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało zerwane."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "Błąd sieci"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) domyślne poruszanie się"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(I) odwrócone ruchy"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) trochę szalonych ruchów"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(C) dużo szalonych ruchów"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr "(d) podwójne normalne + szalone"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr "(?) nieznany sposób poruszania się"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) szalone ruchy numer %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) własne szalone ruchy"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) szalone ruchy"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) domyślne przybliżenie do celu"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) podejdź do 1 pola od celu"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr "(2) podejdź do 2 pól od celu"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr "(3) podejdź do 3 pól od celu"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr "(4) przybliżenie do celu do odległości 4"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr "(5) podejdź do 5 pól od celu"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr "(6) przybliżenie do celu do odległości 6"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr "(7) podejdź do 7 pól od celu"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr "(8) przybliżenie do celu do odległości 8"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr "(9) przybliżenie do celu do odległości 9"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr "(A) podejdź do celu na zasięg ataku"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr "(a) zasięg ataku łucznika"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) podejdź do celu na zasięg ataku - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?) pól do celu"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) domyślne podążanie"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) relatywne podążanie"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) lustrzane podążanie"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) niewolnicze podążanie"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) nieznane podążanie"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) atak"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) domyślny atak"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) zdejmij tarczę do ataku"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) załóż tarczę do ataku"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) idź, atakuj"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) idź, atakuj, podnieś"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) bez autoataku"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?) pól do celu"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) imitacja"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) podnoś w promieniu 1x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) podnoś w promieniu 2x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) podnoś w promieniu 2x3"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) podnoś w promieniu 3x3"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) podejdź i podnoś do 4 pól"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) podejdź i podnoś do 8 pól"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr "(A) podejdź i podnoś w zasięgu wzroku"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) podnoś"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) użyj #flar jako M.A."
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) użyj #chiza jako M.A."
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) użyj #ingrav jako M.A."
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) użyj #frillyar jako M.A."
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) użyj #upmarmu jako M.A."
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) magiczny atak"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr "(a) atakuj wszystkich graczy"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr "(f) atakuj niezaprzyjaźnionych"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr "(b) atakuj nielubianych"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr "(d) nie atakuj graczy"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr "(?) atak PvP"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr "(D) domyślna imitacja"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr "(O) Imituj strój"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr "(?) imitacja"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr "Modyfikatory gry włączone."
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr "Modyfikatory gry wyłączone."
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr "Modyfikatory gry nieznane"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr "(N) normalny widok mapy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr "(D) widok debug"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr "(u) płaska mapa"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr "(U) płaska mapa 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr "(e) mapa bez tekstur, pokazane kolizje"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr "(E) mapa bez tekstur"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr "(b) dwukolorowa mapa"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr "(?) widok mapy"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr "(O) przy klawiaturze"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr "(A) AFK"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr "(?) stan"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "AFK"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) tryb kamery gry"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) wolny tryb kamery"
 
@@ -1733,7 +1750,7 @@ msgstr "Rozmowa"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "Kup"
@@ -1750,7 +1767,7 @@ msgstr "Kup"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "Sprzedaj"
 
@@ -2735,7 +2752,7 @@ msgstr "Otwórz adres url"
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "Wyjdź"
 
@@ -2748,7 +2765,7 @@ msgstr "Wyjdź"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2761,7 +2778,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2772,7 +2789,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "Maks."
 
@@ -5584,7 +5601,7 @@ msgstr "^"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Proszę wykorzystać %d punktów"
@@ -5617,17 +5634,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "Twoje imię musi mieć co najmniej 4 znaki."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "Statystyki postaci w porządku."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "Proszę usunąć %d punktów"
@@ -6839,27 +6856,27 @@ msgstr "Aktualizacja..."
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr "Pokazuj wszystkie wiadomości (może być wolne)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 msgid "##1  The update process is incomplete."
 msgstr "##1 Proces aktualizacji jest niekompletny."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:838
+#: src/gui/windows/updaterwindow.cpp:847
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Jest mocno zalecane abyś"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr "##1  Spróbuj ponownie później."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "Zakończono"
 
@@ -7013,86 +7030,92 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "Zmień sposób podchodzenia do celu"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr "Inne"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "Podnieś"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "Zmień sposób podnoszenia"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "Usiądź"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "Zrzut ekranu"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "Włącz/Wysłącz Handlowanie"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr "Otwórz okno handlu"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "Zmień widok mapy"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "Wybrano OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr "Zatrzymaj się lub usiądź"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr "Powrót do bezpiecznego trybu wyświetlania"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr ""
 
diff --git a/po/pt.po b/po/pt.po
index 6a26bcf66..a667c1319 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr ""
 
@@ -36,8 +36,8 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -47,7 +47,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -65,95 +65,95 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "%d semanas"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr "%d semanas"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "%d dias"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr "%d dias"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "%d horas"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr "%d horas"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "%d minutos"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "%d segundos"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "Recursos de imagens:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr "Variáveis de ambiente despejadas"
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -299,12 +299,12 @@ msgid "Rename your pet"
 msgstr ""
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
@@ -314,7 +314,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
@@ -487,37 +487,37 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -535,7 +535,7 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -547,32 +547,32 @@ msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "Efetuando login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
@@ -586,10 +586,10 @@ msgstr "Mudando servidores do jogo"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -603,37 +603,37 @@ msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
@@ -686,398 +686,415 @@ msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em: %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "Erro de conexão"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr "(?) Movimento desconhecido"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) movimento louco numero %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) movimentos loucos"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr "(a) Alcance de arqueiros"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) Mover até o alvo em distancia de ataque-1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?)  Mover ao alvo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?)  Mover ao alvo"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) Mímica"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr "(a) atacar todos inimigos"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr "(f) ataque todos, exceto amigos"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr "(b) atacar más relações"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr "(d) não atacar jogadores"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr "(?) Ataque PVP"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo ativados"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr "Modificador de jogo desconhecido"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr "(A) Ausente"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr "(?) Ausente"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "Indisponivel"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
@@ -1729,7 +1746,7 @@ msgstr "Falar"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "Comprar"
@@ -1746,7 +1763,7 @@ msgstr "Comprar"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "Vender"
 
@@ -2731,7 +2748,7 @@ msgstr "Abrir URL"
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "Sair"
 
@@ -2744,7 +2761,7 @@ msgstr "Sair"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2757,7 +2774,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2768,7 +2785,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "Máximo"
 
@@ -5575,7 +5592,7 @@ msgstr "^"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
@@ -5608,17 +5625,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -6827,27 +6844,27 @@ msgstr "Atualizando..."
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:838
+#: src/gui/windows/updaterwindow.cpp:847
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "Concluído"
 
@@ -7001,86 +7018,92 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "Mudar o tipo de movimento ao alvo"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr "Outras teclas"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "Pegar item"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "Mudar o modo de pegar itens"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "Sentar"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "Screenshot"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Desabilitar Negociações"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "Mudar o modo de visualização de mapas"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "Selecionar OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr "Parar ou sentar"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr "Retornar para modo seguro de vídeo"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index bb00cb472..02bc6f088 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-06-20 11:04+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -34,7 +34,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr "Arquivo enviado"
 
@@ -47,8 +47,8 @@ msgstr "Arquivo enviado"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -58,7 +58,7 @@ msgstr "Arquivo enviado"
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -76,95 +76,95 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "%d semanas"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr "%d Semanas"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "%d dias"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr "%d Dias"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "%d horas"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr "%d Horas"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "%d minutos"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr "%d Minutos"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "%d segundos"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr "%d Segundos"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "Recursos de imagem:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr "Variáveis de ambiente despejada"
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr "A|rquivos de configuração enviados para:"
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr "Configuração de servidor enviada para:"
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr "Registro enviado em:"
 
@@ -312,12 +312,12 @@ msgid "Rename your pet"
 msgstr "Renomeie seu animal de estimação"
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
@@ -327,7 +327,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "Mapa visivel"
 
@@ -500,37 +500,37 @@ msgstr "Bolha Flutuante"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Configurar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Desempenho"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Vídeo"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr "Sobre"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Ajuda"
@@ -548,7 +548,7 @@ msgstr "Ajuda"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -560,32 +560,32 @@ msgid "Close"
 msgstr "Fechar"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "Conectando-se ao servidor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "Fazendo login"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "Entrando no mundo do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "Requerindo personagens"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "Mudando de servidor do jogo"
 
@@ -599,10 +599,10 @@ msgstr "Mudando de servidor do jogo"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -616,37 +616,37 @@ msgid "Error"
 msgstr "Erro"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "Mudar senha"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "Mudar email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "Adeus, volte sempre..."
 
@@ -699,398 +699,415 @@ msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "Erro de conexão"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr "(?) movimento desconhecido"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) movimento louco número %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) Movimentos loucos"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr "(4) Mover ao alvo com distância 4"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr "(6) Mover ao alvo com distância 6"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr "(8) Mover ao alvo com distância 8"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr "(9) Mover ao alvo com distância 9"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr "(a) Alcance ataque de arqueiro"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) Mover ao alvo em alcance de ataque -1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?) Mover ao alvo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de estimação"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?) Mover ao alvo"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) Mímica"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr "(a) atacar qualquer jogador"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr "(f) ataque todos, exceto amigos"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr "(b) atacar más relações"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr "(d) não atacar jogadores"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr "(?) ataque em pvp"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo desativados"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr "Modificadores são desconhecidos"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr "(e) visão de mapa vazio com colisão"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr "(E) visão de mapa vazio"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr "(?) visualização do mapa"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr "(A) Modo Ausente"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr "(?) Ausente"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "Indisponivel"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
@@ -1742,7 +1759,7 @@ msgstr "Falar"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "Comprar"
@@ -1759,7 +1776,7 @@ msgstr "Comprar"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "Vender"
 
@@ -2745,7 +2762,7 @@ msgstr "Abrir URL"
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "Sair"
 
@@ -2758,7 +2775,7 @@ msgstr "Sair"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2771,7 +2788,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2782,7 +2799,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "Máximo"
 
@@ -5593,7 +5610,7 @@ msgstr "^"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
@@ -5626,17 +5643,17 @@ msgid "U"
 msgstr "U"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
@@ -6846,27 +6863,27 @@ msgstr "Atualizando..."
 msgid "Connecting..."
 msgstr "Conectando..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr "Mostrar todas as noticias (pode ser lento)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 msgid "##1  The update process is incomplete."
 msgstr "##1  O processo de update está incompleto."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:838
+#: src/gui/windows/updaterwindow.cpp:847
 msgid "##1  It is strongly recommended that"
 msgstr "##1  É altamente recomendado que"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr "##1  tente novamente mais tarde."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "Concluído"
 
@@ -7020,86 +7037,92 @@ msgstr "Selecionar mercenário"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "Mudar o tipo de movimento ao alvo"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr "Selecionar animal de estimação"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr "Pegar animal de estimação"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr "Outras teclas"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "Pegar item"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "Mudar o modo de pegar itens"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "Sentar"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "Screenshot"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Desabilitar Negociações"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr "Abrir janela de negociação"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr "Inicia negociação com o alvo."
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr "Segue o jogador selecionado"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "Mudar o modo de visualização de mapas"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "Selecionar OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr "Parar ou sentar"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr "Retornar para o modo seguro de vídeo"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr "Dispensar seu homúnculo"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr "Abrir menu de contexto"
 
diff --git a/po/ru.po b/po/ru.po
index cfe9a1955..4394d9cba 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-04-11 11:22+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
@@ -31,7 +31,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr "Файл выгружен"
 
@@ -44,8 +44,8 @@ msgstr "Файл выгружен"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -55,7 +55,7 @@ msgstr "Файл выгружен"
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -73,95 +73,95 @@ msgstr "ОК"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr "Кеш очищен"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Время работы клиента: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "%d неделя"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr "%d недель"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "%d день"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr "%d дней"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "%d час"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr "%d часов"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "%d минута"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr "%d минут"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "%d секунда"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "Изображений:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr "Переменные среды сохранены"
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr "Информация о выгруженном конфиге:"
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr "Информация о выгруженном конфиге сервера:"
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr "Информация о выгруженном логе:"
 
@@ -307,12 +307,12 @@ msgid "Rename your pet"
 msgstr "Переименовать животное"
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "Игнорировать предложения о торговле"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "Принимать предложения о торговле"
 
@@ -322,7 +322,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
@@ -496,37 +496,37 @@ msgstr "Плавающий пузырек"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Настройка"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Производительность"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Видео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Тема"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr "О Программе"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Помощь"
@@ -544,7 +544,7 @@ msgstr "Помощь"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -556,32 +556,32 @@ msgid "Close"
 msgstr "Закрыть"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "Авторизация"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
@@ -595,10 +595,10 @@ msgstr "Смена игрового сервера"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -612,37 +612,37 @@ msgid "Error"
 msgstr "Ошибка"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "Сменить Email"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
@@ -695,398 +695,415 @@ msgid "Debug"
 msgstr "Отладка"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Снимок экрана сохранен как %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "Ошибка сети"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) движения по умолчанию"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(I) обратное движение"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) обычное движение иногда с сумасшедшими движениями"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(C) движение с сумасшедшими движениями"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr "(d) нормальные и сумасшедшие движения"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr "(?) неизвестное движение"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) сумасшедшее движение %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) пользовательские сумасшедшие движения"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) неизвестные сумасшедшие движения"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) обычное движение к цели"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) движение к цели на расстояние 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr "(2) движение к цели на расстояние 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr "(3) движение к цели на расстояние 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr "(4) движение к цели на расстояние 4"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr "(5) движение к цели на расстояние 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr "(6) движение к цели на расстояние 6"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr "(7) движение к цели на расстояние 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr "(8) движение к цели на расстояние 8"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr "(9) движение к цели на расстояние 9"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr "(A) движение к цели на расстояние атаки"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr "(a) атака лучника"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) движение к цели на расстояние атаки - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?) неизвестное движение к цели"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) следование по умолчанию"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) относительное следование"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) зеркальное следование"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) следование как животное"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) неизвестное следование"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) неизвестная атака"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) обычная атака"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) переключение атаки без щита"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) переключение атаки со щитом"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) идти и атаковать"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) идти, атаковать, собирать"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) без автоатаки"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?) неизвестное движение к цели"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) неизвестная имитация"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) поднятие в области 1x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) поднятие из области 2x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) поднятие из области спереди 2x3"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) поднятие из области 3x3"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) движение и поднятие на расстоянии 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr "(g) движение и поднятие на расстоянии 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr "(A) движение и поднятие на максимальном расстоянии"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) неизвестный режим поднятия"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) использовать #flar для атаки"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) использовать #chiza для атаки"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) использовать #ingrav для атаки"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) использовать #frillyar для атаки"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) использовать #upmarmu для атаки"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) неизвестная магическая атака"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr "(a) атаковать всех игроков"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr "(f) атаковать всех кроме друзей"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr "(b) атаковать врагов"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr "(d) не атаковать игроков"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr "(?) pvp атака"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr "(D) имитация по умолчанию"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr "(O) имитация нарядов"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr "(?) неизвестная имитация"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr "Игровые модификаторы включены"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr "Игровые модификаторы выключены"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr "Игровые модификаторы в неизвестном положении"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr "(N) обычный режим карты"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr "(D) отладочный режим карты"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr "(u) специальный режим карты"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr "(U) специальный режим карты 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr "(e) режим пустой карты с коллизиями"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr "(E) режим пустой карты"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr "(b) черно-белый режим карты"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr "(?) неизвестный режим карты"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr "(O) возле компьютера"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr "(A) отошел"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr "(?) неизвестный режим отошел"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "Отошел"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) игровая камера"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) свободная камера"
 
@@ -1738,7 +1755,7 @@ msgstr "Разговор"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "Купить"
@@ -1755,7 +1772,7 @@ msgstr "Купить"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "Продать"
 
@@ -2741,7 +2758,7 @@ msgstr "Открыть ссылку"
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "Выход"
 
@@ -2754,7 +2771,7 @@ msgstr "Выход"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2767,7 +2784,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2778,7 +2795,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "Макс"
 
@@ -5594,7 +5611,7 @@ msgstr "^"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Распределите очки (%d)"
@@ -5627,17 +5644,17 @@ msgid "U"
 msgstr "?"
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "Имя должно содержать не менее четырех символов."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "Данные персонажа в порядке"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "Снимите очки (%d)"
@@ -6850,27 +6867,27 @@ msgstr "Обновление..."
 msgid "Connecting..."
 msgstr "Соединение..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr "Показать все новости (может быть медленным)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 msgid "##1  The update process is incomplete."
 msgstr "##1  Процесс обновления не завершен."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:838
+#: src/gui/windows/updaterwindow.cpp:847
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Настоятельно рекомендуется"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr "##1  попытаться еще раз немного погодя."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "Завершено"
 
@@ -7024,86 +7041,92 @@ msgstr "Выделение наемника"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "Изменение типа движения и атаки"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr "Выбрать питомца"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr "Поймать питомца"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr "Другие клавиши"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "Поднятие предметов"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "Изменение типа подбора предметов"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "Приседание/Вставание"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "Создание скриншота"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "Разрешение/Запрет торговли"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr "Открывает окно обмена"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr "Начать обмен"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr "Следовать за игроком"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "Изменение режима отображения карты"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "Выбор OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr "Остановиться или сесть"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr "Вернуться в безопасный видео режим"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr "Уволить гомункула"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr "Открыть контекстное меню"
 
diff --git a/po/sv.po b/po/sv.po
index d6a86b6ac..11851f7d7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr ""
 
@@ -33,8 +33,8 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -44,7 +44,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -62,95 +62,95 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr "Cache rensad"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klientupptid: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "%d vecka"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr "%d veckor"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "%d dag"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr "%d dagar"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "%d timme"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr "%d timmar"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "%d minut"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuter"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "%d sekund"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -296,12 +296,12 @@ msgid "Rename your pet"
 msgstr ""
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorera inkommande bytes-förfrågningar"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "Acceptera inkommande bytes-förfrågningar"
 
@@ -311,7 +311,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "Synlig på karta"
 
@@ -484,37 +484,37 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hjälp"
@@ -532,7 +532,7 @@ msgstr "Hjälp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -544,32 +544,32 @@ msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "Loggar in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
@@ -583,10 +583,10 @@ msgstr "Ändrar spelserver"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -600,37 +600,37 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "Avregistrering lyckad"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "Farväl, kom gärna tillbaka snart igen..."
 
@@ -683,398 +683,415 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Skärmdump sparades som %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "Spara skärmdump misslyckades!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr "Anslutningen till servern förlorades."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "Nätverksfel"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) standardrörelse"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(I) invertera rörelse"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) rör sig med några crazy moves"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(C) rör sig med crazy moves"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr "(d) dubbel normal + crazy"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr "(?) okänt move"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) crazy move nummer %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) standard crazy move"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) crazy move"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) standardrörelse mot target"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) närmar sig target med distans 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr "(2) närmar sig target med distance 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr " (3) närmar sig target med distans 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr " (5) närmar sig target med distans 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr " (7) närmar sig target med distans 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr " (A) närmar sig target till attack range"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr "(a) archer attack-range"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) flyttar till target för attack-range - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?) förflyttar sig till target"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) standard follow"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) relativ follow"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) härma follow"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) pet follow"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) okänd follow"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) attack"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) standardattack"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) växla attack utan shield"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) växla attack med shield"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) gå och attackera"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) gå, attackera, pickup"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) utan automatisk attack"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?) förflyttar sig till target"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) imitation"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) liten pick up 1x1 cells"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) standard pick up 2x1 cells"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) framåt pick up 2x3 cells"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) pick up 3x3 cells"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) gå och pick up med distans 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) gå och pick up med distans 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr "(A) gå och pick up med maximal distans"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) pick up"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) använd #flar för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) använd #chiza för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) använd #ingrav för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) använd #frillyar för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) använd #upmarmu för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) magic attack"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr "(a) attackera alla spelare"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr "(f) attackera alla utom dina friends"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr "(b) attackera dåliga relationer"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr "(d) attackera inte spelare"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr "(?) pvp-attack"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr "(D) Standardimitation"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr "(O) klädselimitation"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr "(?) imitation"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr "Game modifiers är aktiverade"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr "Game modifiers är inaktiverade"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr "Game modifiers är okända"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr "(N) normal kartvy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr "(D) debug kartvy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr "(u) ultra-kartvy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra-kartvy 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr "(b) svartvit kartvy"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr "(O) på tangentbord"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr "(A) away"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr "(?) away"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "Iväg"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) spelkamera-läge"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) fritt kamera-läge"
 
@@ -1722,7 +1739,7 @@ msgstr "Prata med"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "Köp"
@@ -1739,7 +1756,7 @@ msgstr "Köp"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "Sälj"
 
@@ -2724,7 +2741,7 @@ msgstr "Öppna url"
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -2737,7 +2754,7 @@ msgstr "Avsluta"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2750,7 +2767,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2761,7 +2778,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "Max"
 
@@ -5569,7 +5586,7 @@ msgstr "^"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Vänligen distribuera %d poäng"
@@ -5602,17 +5619,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ditt namn måste vara minst 4 tecken långt."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "Karaktär-stats OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "Vänligen ta bort %d poäng"
@@ -6823,27 +6840,27 @@ msgstr "Uppdaterar..."
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 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:838
+#: src/gui/windows/updaterwindow.cpp:847
 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:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr "##1 du försöker senare igen."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "Färdig"
 
@@ -6997,86 +7014,92 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "Ändra \"Move to Target\"-type"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr "Andra tangenter"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "Pickup"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "Ändra Pickup-typ"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "Sitt"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "Skärmdump"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "Aktivera/Avaktivera Trading"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "Ändra Kartvy-läge"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "Välj OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr "Stanna eller sitt"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr "Återgå till säkert video-läge"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr ""
 
diff --git a/po/sv_SE.po b/po/sv_SE.po
index d6a86b6ac..11851f7d7 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr ""
 
@@ -33,8 +33,8 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -44,7 +44,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -62,95 +62,95 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr "Cache rensad"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klientupptid: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "%d vecka"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr "%d veckor"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "%d dag"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr "%d dagar"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "%d timme"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr "%d timmar"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "%d minut"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuter"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "%d sekund"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -296,12 +296,12 @@ msgid "Rename your pet"
 msgstr ""
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorera inkommande bytes-förfrågningar"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "Acceptera inkommande bytes-förfrågningar"
 
@@ -311,7 +311,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "Synlig på karta"
 
@@ -484,37 +484,37 @@ msgstr "Floating bubble"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Inställningar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Hjälp"
@@ -532,7 +532,7 @@ msgstr "Hjälp"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -544,32 +544,32 @@ msgid "Close"
 msgstr "Stäng"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "Ansluter till server"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "Loggar in"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "Går in i spelvärld"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "Begär karaktärer"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "Ansluter till spelservern"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "Ändrar spelserver"
 
@@ -583,10 +583,10 @@ msgstr "Ändrar spelserver"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -600,37 +600,37 @@ msgid "Error"
 msgstr "Error"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Begär registreringsuppgifter"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "Lösenordsändring"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "Lösenordsändring har lyckats!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "Byte av E-post"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "E-posten har ändrats!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "Avregistrering lyckad"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "Farväl, kom gärna tillbaka snart igen..."
 
@@ -683,398 +683,415 @@ msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Skärmdump sparades som %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "Spara skärmdump misslyckades!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr "Anslutningen till servern förlorades."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "Nätverksfel"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) standardrörelse"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(I) invertera rörelse"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) rör sig med några crazy moves"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(C) rör sig med crazy moves"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr "(d) dubbel normal + crazy"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr "(?) okänt move"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) crazy move nummer %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) standard crazy move"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) crazy move"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) standardrörelse mot target"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) närmar sig target med distans 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr "(2) närmar sig target med distance 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr " (3) närmar sig target med distans 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr " (5) närmar sig target med distans 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr " (7) närmar sig target med distans 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr " (A) närmar sig target till attack range"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr "(a) archer attack-range"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) flyttar till target för attack-range - 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?) förflyttar sig till target"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) standard follow"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) relativ follow"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) härma follow"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) pet follow"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) okänd follow"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) attack"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) standardattack"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) växla attack utan shield"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) växla attack med shield"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) gå och attackera"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) gå, attackera, pickup"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) utan automatisk attack"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?) förflyttar sig till target"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) imitation"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) liten pick up 1x1 cells"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) standard pick up 2x1 cells"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) framåt pick up 2x3 cells"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) pick up 3x3 cells"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) gå och pick up med distans 4"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) gå och pick up med distans 8"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr "(A) gå och pick up med maximal distans"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) pick up"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) använd #flar för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) använd #chiza för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) använd #ingrav för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) använd #frillyar för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) använd #upmarmu för magic attack"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) magic attack"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr "(a) attackera alla spelare"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr "(f) attackera alla utom dina friends"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr "(b) attackera dåliga relationer"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr "(d) attackera inte spelare"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr "(?) pvp-attack"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr "(D) Standardimitation"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr "(O) klädselimitation"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr "(?) imitation"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr "Game modifiers är aktiverade"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr "Game modifiers är inaktiverade"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr "Game modifiers är okända"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr "(N) normal kartvy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr "(D) debug kartvy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr "(u) ultra-kartvy"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra-kartvy 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr "(b) svartvit kartvy"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr "(O) på tangentbord"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr "(A) away"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr "(?) away"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "Iväg"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) spelkamera-läge"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) fritt kamera-läge"
 
@@ -1722,7 +1739,7 @@ msgstr "Prata med"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "Köp"
@@ -1739,7 +1756,7 @@ msgstr "Köp"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "Sälj"
 
@@ -2724,7 +2741,7 @@ msgstr "Öppna url"
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -2737,7 +2754,7 @@ msgstr "Avsluta"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2750,7 +2767,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2761,7 +2778,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "Max"
 
@@ -5569,7 +5586,7 @@ msgstr "^"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Vänligen distribuera %d poäng"
@@ -5602,17 +5619,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ditt namn måste vara minst 4 tecken långt."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "Karaktär-stats OK"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "Vänligen ta bort %d poäng"
@@ -6823,27 +6840,27 @@ msgstr "Uppdaterar..."
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 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:838
+#: src/gui/windows/updaterwindow.cpp:847
 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:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr "##1 du försöker senare igen."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "Färdig"
 
@@ -6997,86 +7014,92 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "Ändra \"Move to Target\"-type"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr "Andra tangenter"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "Pickup"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "Ändra Pickup-typ"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "Sitt"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "Skärmdump"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "Aktivera/Avaktivera Trading"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "Ändra Kartvy-läge"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "Välj OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr "Stanna eller sitt"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr "Återgå till säkert video-läge"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr ""
 
diff --git a/po/tr.po b/po/tr.po
index 896aa0234..4ed0ad024 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr "Dosya yüklendi"
 
@@ -35,8 +35,8 @@ msgstr "Dosya yüklendi"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -46,7 +46,7 @@ msgstr "Dosya yüklendi"
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -64,95 +64,95 @@ msgstr "TAMAM"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr "Bellek temizlendi"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client çalışma süresi: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "%d hafta"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr "%d haftalar"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "%d gün"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr "%d günler"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "%d saat"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr "%d saatler"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "%d dakika"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr "%d dakikalar"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "%d saniye"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr "%d saniyeler"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "Kaynak resimleri:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "Edinilmiş kaynak resimleri:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr "Çevre değişkenleri yığıldı"
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr "Config bilgisi şuraya yüklendi:"
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr "Server configi şuraya yüklendi:"
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr "Log kayıtları şuraya yüklendi:"
 
@@ -298,12 +298,12 @@ msgid "Rename your pet"
 msgstr ""
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "Gelen takas istekleri görmezden geliniyor."
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "Gelen takas istekleri kabul ediliyor"
 
@@ -313,7 +313,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "Haritada görünür"
 
@@ -486,37 +486,37 @@ msgstr "Yüzen balon"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Ayarlar"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Performans"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Video"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Tema"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr "Hakkında"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Yardım"
@@ -534,7 +534,7 @@ msgstr "Yardım"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -546,32 +546,32 @@ msgid "Close"
 msgstr "Kapat"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "Sunucuya bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "Giriş yapılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "Oyun dünyasına giriliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "Karakterler isteniliyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "Oyun sunucusuna bağlanılıyor"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "Oyun sunucusu değiştiriliyor"
 
@@ -585,10 +585,10 @@ msgstr "Oyun sunucusu değiştiriliyor"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -602,37 +602,37 @@ msgid "Error"
 msgstr "Hata"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Kayıt detayları isteniyor"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "Şifre Değiştir"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "Şifreniz başarı ile değiştirildi!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "E-posta Değiştir"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "E-posta başarı ile değiştirildi!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "Kayıt silme başarılı"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "Hoşçakal, tekrar bekleriz..."
 
@@ -685,398 +685,415 @@ msgid "Debug"
 msgstr "Hata ayıklama"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Ekran görüntüsü %s olarak kaydedildi"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "Ekran görüntüsü kaydı başarısız!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr "Sunucu bağlantısı koptu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "Ağ Hatası"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) varsayılan hareketler"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(I) devrik hareketler"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) biraz çılgın hareket + normal hareket"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(C) çılgın hareket"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr "(d) iki kat normal + çılgın"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr "(?) bilinmeyen hareket"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) çılgın hareket sayısı %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) değiştirilmiş çılgın hareket"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) çılgın hareket"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) hedefe varsayılan hareket"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) 1 uzaklığındaki hedefe hareket"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr "(2) 2 uzaklığındaki hedefe hareket"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr "(3) 3 uzaklığındaki hedefe hareket"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr "(4) 4 uzaklığındaki hedefe hareket"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr "(5) 5 uzaklığındaki hedefe hareket"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr "(6) 6 uzaklığındaki hedefe hareket"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr "(7) 7 uzaklığındaki hedefe hareket"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr "(8) 8 uzaklığındaki hedefe hareket"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr "(9) 9 uzaklığındaki hedefe hareket"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr "(A) saldırı menzilindeki hedefe hareket"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr "(a) okçu saldırı menzili"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) saldırı menzilinden -1 uzaklıktaki hedefe hareket"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?) hedefe hareket"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) varsayılan takip"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) göreceli takip"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) tıpatıp takip"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) pet takibi"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) bilinmeyen takip"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) saldırı"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) varsayılan saldırı"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) kalkansız saldırıya geçildi"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) kalkanlı saldırıya geçildi"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) git ve saldır"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) git, saldır, topla"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) otomatik atak olmadan"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?) hedefe hareket"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) taklit"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) küçük, 1x1 kareden topla"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) varsayılan, 2x1 kareden topla"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) ileri, 2x3 kareden topla"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) 3x3 kareden topla"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) 4 kare uzaklığa kadar git ve topla"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) 8 kare uzaklığa kadar git ve topla"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr "(A) max uzaklığa kadar git ve topla"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) topla"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) büyü saldırısı için #flar kullan"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) büyü saldırısı için #chiza kullan"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) büyü saldırısı için #ingrav kullan"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) büyü saldırısı için #frillyar kullan"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) büyü saldırısı için #upmarmu kullan"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) büyü saldırısı"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr "(a) bütün oyunculara saldır"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr "(f) arkadaşlar hariç herkese saldır"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr "(b) ilişki durumun kötü olanlara saldır"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr "(d) oyunculara saldırma"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr "(?) pvp saldırısı"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr "(D) varsayılan taklit"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr "(O) kıyafet taklidi"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr "(?) taklit"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr "Oyun modifiyeleri aktifleştirildi"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr "Oyun modifiyeleri deaktifleştirildi"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr "Oyun modifiyeleri bilinmiyor"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr "(N) normal harita görnüşü"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr "(D) debug harita görünüşü"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr "(u) ultra harita görünüşü"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra harita görünüşü 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr "(e) çarpışmalı boş harita"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr "(E) boş harita görünüşü"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr "(b) siyah & beyaz harita görünüşü"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr "(?) harita görünüşü"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr "(O) klavyede"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr "(A) uzakta"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr "(?) uzakta"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "Uzakta"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) Oyun kamera modu"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) serbest kamera modu"
 
@@ -1728,7 +1745,7 @@ msgstr "Konuş"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "Satın Al"
@@ -1745,7 +1762,7 @@ msgstr "Satın Al"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "Sat"
 
@@ -2729,7 +2746,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "Çıkış"
 
@@ -2742,7 +2759,7 @@ msgstr "Çıkış"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2755,7 +2772,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2766,7 +2783,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "En Fazla"
 
@@ -5570,7 +5587,7 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Lütfen %d puanı dağıt"
@@ -5603,17 +5620,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "Adınızda en az 4 karakter olması gerekir."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "Karakter istatistikleri TAMAM"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "Lütfen %d puanı eksilt"
@@ -6815,27 +6832,27 @@ msgstr "Güncelleniyor..."
 msgid "Connecting..."
 msgstr "Bağlanıyor..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 msgid "##1  The update process is incomplete."
 msgstr "##1 Güncelleme işlemi tamamlanamadı."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:838
+#: src/gui/windows/updaterwindow.cpp:847
 msgid "##1  It is strongly recommended that"
 msgstr "##1 Şiddetle tavsiye edilir ki"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr "##1 daha sonra tekrar deneyiniz."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "Tamamlandı"
 
@@ -6989,86 +7006,92 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "Hedefe gitme tipini değiştir"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "Topla"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "Toplama Tipini Değiştir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "Otur"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "Ekran Görüntüsü"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "Takası Aktifleştir/Deaktifleştir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "Harita Görüş Modunu değiştir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "Seçim Tamam"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 7e5c99a81..c23044344 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/manaplus/"
@@ -23,7 +23,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr "Файл завантажено"
 
@@ -36,8 +36,8 @@ msgstr "Файл завантажено"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -47,7 +47,7 @@ msgstr "Файл завантажено"
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -65,95 +65,95 @@ msgstr "ОК"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr "Кеш прибрано"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Час безперервної роботи клієнта: %s"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr "%d тиждень"
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr "%d тижнів"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr "%d день"
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr "%d днів"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr "%d година"
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr "%d годин"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr "%d хвилина"
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr "%d хвилин"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr "%d секунда"
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr "Зображень:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr "Вилучених зображень:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr "Змінні середовища збережені"
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr "Завантажений конфіг:"
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr "Завантажена конфігурація сервера:"
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr "Завантажений лог:"
 
@@ -301,12 +301,12 @@ msgid "Rename your pet"
 msgstr ""
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "Ігнорування вхідних пропозицій торгівлі"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "Приймання вхідних пропозицій торгівлі"
 
@@ -316,7 +316,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "Видимий на мапі"
 
@@ -490,37 +490,37 @@ msgstr "Плаваюча бульбашка"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "Налаштування"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr "Продуктивність"
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "Відео"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "Теми"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr "Про програму"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "Довідка"
@@ -538,7 +538,7 @@ msgstr "Довідка"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -550,32 +550,32 @@ msgid "Close"
 msgstr "Закрити"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "Очікування відповіді сервера"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "Авторизація..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "Поринаємо в ігровий всесвіт..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "Завантаження списку персонажів..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "Приєднання до серверу..."
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "Зміна ігрового серверу..."
 
@@ -589,10 +589,10 @@ msgstr "Зміна ігрового серверу..."
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -606,37 +606,37 @@ msgid "Error"
 msgstr "Помилка"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "Запитуємо деталі реєстрації"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "Змінити пароль"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "Пароль змінено!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "Змінити імейл"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "Імейл змінено!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "Акаунт видалено"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "До побачення та вертайтесь."
 
@@ -689,398 +689,415 @@ msgid "Debug"
 msgstr "Зневадження"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Скріншот збережено як %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "Збереження скріншоту провалилось!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr "Втрачено з'єднання з сервером."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "Мережева помилка"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr "(D) рухи за замовчуванням"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr "(I) інверсія рухів"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr "(c) рух з малою часткою божевільних рухів"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr "(C) часткові божевільні рухи"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr "(d) двічі нормальні рухи + божевільні"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr "(?) невідомий тип рухів"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr "(%u) божевільні рухи номер %u"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr "(a) користувацькі божевільні рухи"
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr "(?) невідомий тип божевільних рухів"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr "(0) нормальний рух до цілі"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr "(1) наблизитись до цілі на відстань 1"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr "(2) наблизитись до цілі на відстань 2"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr "(3) наблизитись до цілі на відстань 3"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr "(4) наблизитись до цілі на відстань 4"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr "(5) наблизитись до цілі на відстань 5"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr "(6) наблизитись до цілі на відстань 6"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr "(7) наблизитись до цілі на відстань 7"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr "(8) наблизитись до цілі на відстань 8"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr "(9) наблизитись до цілі на відстань 9"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr "(A) наблизитись до цілі на відстань атаки"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr "(a) стрілецька відстань до цілі"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr "(B) рухатись впритул до цілі"
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?) рух до цілі"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr "(D) слідкування за замочуванням"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr "(R) відносне слідкування"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr "(M) віддзеркалене слідкування"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr "(P) побути улюбленцем"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr "(?) невідомий режим слідкування"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) невідомий режим атаки"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr "(D) атака за замовчуванням"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr "(s) перемкнути атаку без щита"
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr "(S) перемкнути атаку зі щитом"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) наблизитись і атакувати"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr "(A) наблизитись, атакувати і підняти дропи"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr "(d) без автоатаки"
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?) рух до цілі"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?) невідомий тип імітації"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) піднімати в зоні 1x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) піднімати в зоні 2x1"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) піднімати в зоні 2x3"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) піднімати в зоні 3x3"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) наблизитись і підняти в межі 4 кроків"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) наблизитись і підняти в межі 8 кроків"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr "(A) наблизитись на потрібну відстань і підняти"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?) невідомий режим підняття"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr "(f) магічна атака із #flar"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) магічна атака із #chiza"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) магічна атака із #ingrav"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) магічна атака із #frillyar"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) магічна атака із #upmarmu"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr "(?) невідомий тип магічної атаки"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr "(a) атакувати всіх без розбору"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr "(f) атакувати всіх окрім приятелів"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr "(b) атакувати гравців з поганими стосунками"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr "(d) не атакувати гравців"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr "(?) невідомий тип PVP атаки"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr "(D) імітація за замовчуванням"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr "(O) імітувати спорядження"
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr "(?) невідомий тип імітації"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr "Клавіші Жовтого рядка активовані"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr "Клавіші Жовтого рядка деактивовані"
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr "Невідомий стан Жовтого рядка"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr "(N) нормальний вид мапи"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr "(D) режим зневадження мапи"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr "(u) ультра режим мапи"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr "(U) ультра режим мапи 2"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr "(e) порожня мапа з видимим шаром зіткнень"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr "(E) порожня мапа"
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr "(b) чорно-біла мапа"
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr "(?) невідомий режим мапи"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr "(O) присутній"
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr "(A) відсутній"
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr "(?) стан присутності невідомий"
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "Відсутній"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr "(G) ігровий режим камери"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr "(F) вільний режим камери"
 
@@ -1730,7 +1747,7 @@ msgstr "Діалог"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "Придбати"
@@ -1747,7 +1764,7 @@ msgstr "Придбати"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "Продати"
 
@@ -2732,7 +2749,7 @@ msgstr "Відвідати посилання"
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "Вийти"
 
@@ -2745,7 +2762,7 @@ msgstr "Вийти"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2758,7 +2775,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2769,7 +2786,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "Все"
 
@@ -5577,7 +5594,7 @@ msgstr "^"
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Будь ласка, розподіліть %d балів"
@@ -5610,17 +5627,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "Ім'я повинно містити принаймні 4 символи."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "Характеристики персонажа в нормі"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "Будь ласка, видаліть %d балів"
@@ -6831,27 +6848,27 @@ msgstr "Оновлення..."
 msgid "Connecting..."
 msgstr "З'єднуюсь..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr "Показати всі новини (може бути повільним)"
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 msgid "##1  The update process is incomplete."
 msgstr "##1  Процес поновлення не завершився."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:838
+#: src/gui/windows/updaterwindow.cpp:847
 msgid "##1  It is strongly recommended that"
 msgstr "##1  Настійно рекомендовано"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr "##1  спробувати ще раз пізніше."
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "Завершено"
 
@@ -7005,86 +7022,92 @@ msgstr "Вибрати крамаря"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "Змінити тип руху до цілі"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr "Вибрати улюбленця"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr "Зловити улюбленця"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr "Інші клавіші"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "Підняти"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "Змінити тип підбирання"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "Присісти"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "Скріншот"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "Ввімкнути/вимкнути торгівлю"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr "Відкрити вікно торгівлі"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr "Торгувати з ціллю"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr "Йти слідом за вибраним гравцем"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "Змінити режим мапи"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "Вибрати ОК"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr "Зупинитись або присісти"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr "Повернутись до безпечного відеорежиму"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr "Звільнити гомункула"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr "Відкрити контекстне меню"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 607498177..01425b573 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-07-18 14:24+0300\n"
+"POT-Creation-Date: 2015-07-26 18:56+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
@@ -27,7 +27,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:154
+#: src/actions/actions.cpp:155
 msgid "File uploaded"
 msgstr ""
 
@@ -40,8 +40,8 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:157 src/client.cpp:1424 src/client.cpp:1457
-#: src/gamemodifiers.cpp:440 src/gui/dialogsmanager.cpp:168
+#: src/actions/actions.cpp:158 src/client.cpp:1450 src/client.cpp:1483
+#: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:168
 #: src/gui/dialogsmanager.cpp:188 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:313
 #: src/gui/widgets/tabs/setup_theme.cpp:349
@@ -51,7 +51,7 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_video.cpp:412
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
-#: src/gui/windows/charcreatedialog.cpp:382
+#: src/gui/windows/charcreatedialog.cpp:390
 #: src/gui/windows/charselectdialog.cpp:280
 #: src/gui/windows/charselectdialog.cpp:327 src/gui/windows/editdialog.cpp:50
 #: src/gui/windows/editserverdialog.cpp:56
@@ -69,95 +69,95 @@ msgstr "确定"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:971 src/actions/actions.cpp:984
+#: src/actions/actions.cpp:983 src/actions/actions.cpp:996
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1120 src/actions/actions.cpp:1177
+#: src/actions/actions.cpp:1132 src/actions/actions.cpp:1189
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1132
+#: src/actions/actions.cpp:1144
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1143
+#: src/actions/actions.cpp:1155
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1153
+#: src/actions/actions.cpp:1165
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1163
+#: src/actions/actions.cpp:1175
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1173
+#: src/actions/actions.cpp:1185
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1235 src/actions/actions.cpp:1244
+#: src/actions/actions.cpp:1247 src/actions/actions.cpp:1256
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1238 src/actions/actions.cpp:1248
+#: src/actions/actions.cpp:1250 src/actions/actions.cpp:1260
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1337
+#: src/actions/actions.cpp:1349
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1462
+#: src/actions/actions.cpp:1474
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1471
+#: src/actions/actions.cpp:1483
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1480
+#: src/actions/actions.cpp:1492
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -303,12 +303,12 @@ msgid "Rename your pet"
 msgstr ""
 
 #. TRANSLATORS: disable trades message
-#: src/actions/statusbar.cpp:172
+#: src/actions/statusbar.cpp:177
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
 #. TRANSLATORS: enable trades message
-#: src/actions/statusbar.cpp:182
+#: src/actions/statusbar.cpp:187
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
@@ -318,7 +318,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1368
+#: src/actormanager.cpp:1375
 msgid "Visible on map"
 msgstr "在地图上可见"
 
@@ -490,37 +490,37 @@ msgstr "流动的泡沫"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:864 src/gui/windowmenu.cpp:177
+#: src/client.cpp:803 src/gui/windowmenu.cpp:177
 #: src/gui/windows/setupwindow.cpp:64
 msgid "Setup"
 msgstr "设置"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:867 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:806 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:870 src/gui/widgets/tabs/setup_video.cpp:106
+#: src/client.cpp:809 src/gui/widgets/tabs/setup_video.cpp:106
 msgid "Video"
 msgstr "视频"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:873 src/gui/widgets/tabs/setup_theme.cpp:121
+#: src/client.cpp:812 src/gui/widgets/tabs/setup_theme.cpp:121
 msgid "Theme"
 msgstr "主题"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:876
+#: src/client.cpp:815
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:879 src/gui/windowmenu.cpp:72
+#: src/client.cpp:818 src/gui/windowmenu.cpp:72
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "帮助"
@@ -538,7 +538,7 @@ msgstr "帮助"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:883 src/client.cpp:1342 src/client.cpp:1361
+#: src/client.cpp:822 src/client.cpp:1368 src/client.cpp:1387
 #: src/gui/dialogsmanager.cpp:105 src/gui/popups/popupmenu.cpp:738
 #: src/gui/popups/popupmenu.cpp:979 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:265
@@ -550,32 +550,32 @@ msgid "Close"
 msgstr "关闭"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1013 src/gui/windowmanager_unittest.cc:150
+#: src/client.cpp:1039 src/gui/windowmanager_unittest.cc:150
 msgid "Connecting to server"
 msgstr "正在连接服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1059 src/gui/windowmanager_unittest.cc:167
+#: src/client.cpp:1085 src/gui/windowmanager_unittest.cc:167
 msgid "Logging in"
 msgstr "登录中"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1102
+#: src/client.cpp:1128
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1234
+#: src/client.cpp:1260
 msgid "Requesting characters"
 msgstr "请求角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1273
+#: src/client.cpp:1299
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1284
+#: src/client.cpp:1310
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
@@ -589,10 +589,10 @@ msgstr "正在更改游戏服务器"
 #. TRANSLATORS: error header
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error header
-#: src/client.cpp:1339 src/client.cpp:1358 src/client.cpp:1569
+#: src/client.cpp:1365 src/client.cpp:1384 src/client.cpp:1595
 #: src/gui/windows/changeemaildialog.cpp:166
 #: src/gui/windows/changepassworddialog.cpp:156
-#: src/gui/windows/charcreatedialog.cpp:378
+#: src/gui/windows/charcreatedialog.cpp:386
 #: src/gui/windows/charselectdialog.cpp:324
 #: src/gui/windows/editserverdialog.cpp:211
 #: src/gui/windows/registerdialog.cpp:241
@@ -606,37 +606,37 @@ msgid "Error"
 msgstr "错误"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1377
+#: src/client.cpp:1403
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1420
+#: src/client.cpp:1446
 msgid "Password Change"
 msgstr "更改密码"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1422
+#: src/client.cpp:1448
 msgid "Password changed successfully!"
 msgstr "密码更改成功!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1453
+#: src/client.cpp:1479
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1455
+#: src/client.cpp:1481
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1485
+#: src/client.cpp:1511
 msgid "Unregister Successful"
 msgstr "取消注册成功"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1487
+#: src/client.cpp:1513
 msgid "Farewell, come back any time..."
 msgstr "再见，欢迎随时回来..."
 
@@ -689,398 +689,415 @@ msgid "Debug"
 msgstr "调试"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:560
+#: src/game.cpp:556
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:570
+#: src/game.cpp:566
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:655
+#: src/game.cpp:651
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:658
+#: src/game.cpp:654
 msgid "Network Error"
 msgstr "网络错误"
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:148
+#: src/gamemodifiers.cpp:149
 msgid "(D) default moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:150
+#: src/gamemodifiers.cpp:151
 msgid "(I) invert moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:152
+#: src/gamemodifiers.cpp:153
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:154
+#: src/gamemodifiers.cpp:155
 msgid "(C) moves with crazy moves"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:156
+#: src/gamemodifiers.cpp:157
 msgid "(d) double normal + crazy"
 msgstr ""
 
 #. TRANSLATORS: move type in status bar
-#: src/gamemodifiers.cpp:158
+#: src/gamemodifiers.cpp:159
 msgid "(?) unknown move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:183
+#: src/gamemodifiers.cpp:184
 #, c-format
 msgid "(%u) crazy move number %u"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:189
+#: src/gamemodifiers.cpp:190
 msgid "(a) custom crazy move"
 msgstr ""
 
 #. TRANSLATORS: crazy move type in status bar
-#: src/gamemodifiers.cpp:194
+#: src/gamemodifiers.cpp:195
 msgid "(?) crazy move"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:201
+#: src/gamemodifiers.cpp:202
 msgid "(0) default moves to target"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:203
+#: src/gamemodifiers.cpp:204
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:205
+#: src/gamemodifiers.cpp:206
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:207
+#: src/gamemodifiers.cpp:208
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:209
+#: src/gamemodifiers.cpp:210
 msgid "(4) moves to target in distance 4"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:211
+#: src/gamemodifiers.cpp:212
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:213
+#: src/gamemodifiers.cpp:214
 msgid "(6) moves to target in distance 6"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:215
+#: src/gamemodifiers.cpp:216
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:217
+#: src/gamemodifiers.cpp:218
 msgid "(8) moves to target in distance 8"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:219
+#: src/gamemodifiers.cpp:220
 msgid "(9) moves to target in distance 9"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:221
+#: src/gamemodifiers.cpp:222
 msgid "(A) moves to target in attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:223
+#: src/gamemodifiers.cpp:224
 msgid "(a) archer attack range"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:225
+#: src/gamemodifiers.cpp:226
 msgid "(B) moves to target in attack range - 1"
 msgstr ""
 
 #. TRANSLATORS: move to target type in status bar
-#: src/gamemodifiers.cpp:227
+#: src/gamemodifiers.cpp:228
 msgid "(?) move to target"
 msgstr "(?)移动到目标"
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:233
+#: src/gamemodifiers.cpp:234
 msgid "(D) default follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:235
+#: src/gamemodifiers.cpp:236
 msgid "(R) relative follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:237
+#: src/gamemodifiers.cpp:238
 msgid "(M) mirror follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:239
+#: src/gamemodifiers.cpp:240
 msgid "(P) pet follow"
 msgstr ""
 
 #. TRANSLATORS: folow mode in status bar
-#: src/gamemodifiers.cpp:241
+#: src/gamemodifiers.cpp:242
 msgid "(?) unknown follow"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:247 src/gamemodifiers.cpp:255
-#: src/gamemodifiers.cpp:269
+#: src/gamemodifiers.cpp:248 src/gamemodifiers.cpp:256
+#: src/gamemodifiers.cpp:270
 msgid "(?) attack"
 msgstr "(?) 攻击"
 
 #. TRANSLATORS: switch attack type in status bar
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:249 src/gamemodifiers.cpp:261
+#: src/gamemodifiers.cpp:250 src/gamemodifiers.cpp:262
 msgid "(D) default attack"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:251
+#: src/gamemodifiers.cpp:252
 msgid "(s) switch attack without shield"
 msgstr ""
 
 #. TRANSLATORS: switch attack type in status bar
-#: src/gamemodifiers.cpp:253
+#: src/gamemodifiers.cpp:254
 msgid "(S) switch attack with shield"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:263
+#: src/gamemodifiers.cpp:264
 msgid "(G) go and attack"
 msgstr "(G) 去攻击"
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:265
+#: src/gamemodifiers.cpp:266
 msgid "(A) go, attack, pickup"
 msgstr ""
 
 #. TRANSLATORS: attack type in status bar
-#: src/gamemodifiers.cpp:267
+#: src/gamemodifiers.cpp:268
 msgid "(d) without auto attack"
 msgstr ""
 
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:276
+#, fuzzy
+msgid "(D) don't switch target"
+msgstr "(?)移动到目标"
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:278
+msgid "(C) always attack closest"
+msgstr ""
+
+#. TRANSLATORS: targeting type in status bar
+#: src/gamemodifiers.cpp:280
+#, fuzzy
+msgid "(?) targeting"
+msgstr "(?)移动到目标"
+
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:303
+#: src/gamemodifiers.cpp:314
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:305
+#: src/gamemodifiers.cpp:316
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:307
+#: src/gamemodifiers.cpp:318
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:309
+#: src/gamemodifiers.cpp:320
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:311
+#: src/gamemodifiers.cpp:322
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:313
+#: src/gamemodifiers.cpp:324
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:315
+#: src/gamemodifiers.cpp:326
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:317
+#: src/gamemodifiers.cpp:328
 msgid "(?) pick up"
 msgstr "(?)拿起"
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:323
+#: src/gamemodifiers.cpp:334
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:325
+#: src/gamemodifiers.cpp:336
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:327
+#: src/gamemodifiers.cpp:338
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:329
+#: src/gamemodifiers.cpp:340
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:331
+#: src/gamemodifiers.cpp:342
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #. TRANSLATORS: magic attack in status bar
-#: src/gamemodifiers.cpp:333
+#: src/gamemodifiers.cpp:344
 msgid "(?) magic attack"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:339
+#: src/gamemodifiers.cpp:350
 msgid "(a) attack all players"
 msgstr "(a) 攻击所有玩家"
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:341
+#: src/gamemodifiers.cpp:352
 msgid "(f) attack all except friends"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:343
+#: src/gamemodifiers.cpp:354
 msgid "(b) attack bad relations"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:345
+#: src/gamemodifiers.cpp:356
 msgid "(d) don't attack players"
 msgstr ""
 
 #. TRANSLATORS: player attack type in status bar
-#: src/gamemodifiers.cpp:347
+#: src/gamemodifiers.cpp:358
 msgid "(?) pvp attack"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:353
+#: src/gamemodifiers.cpp:364
 msgid "(D) default imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:355
+#: src/gamemodifiers.cpp:366
 msgid "(O) outfits imitation"
 msgstr ""
 
 #. TRANSLATORS: imitation type in status bar
-#: src/gamemodifiers.cpp:357
+#: src/gamemodifiers.cpp:368
 msgid "(?) imitation"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:363
+#: src/gamemodifiers.cpp:374
 msgid "Game modifiers are enabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:365
+#: src/gamemodifiers.cpp:376
 msgid "Game modifiers are disabled"
 msgstr ""
 
 #. TRANSLATORS: game modifiers state in status bar
-#: src/gamemodifiers.cpp:367
+#: src/gamemodifiers.cpp:378
 msgid "Game modifiers are unknown"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:381
+#: src/gamemodifiers.cpp:392
 msgid "(N) normal map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:383
+#: src/gamemodifiers.cpp:394
 msgid "(D) debug map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:385
+#: src/gamemodifiers.cpp:396
 msgid "(u) ultra map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:387
+#: src/gamemodifiers.cpp:398
 msgid "(U) ultra map view 2"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:389
+#: src/gamemodifiers.cpp:400
 msgid "(e) empty map view with collision"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:391
+#: src/gamemodifiers.cpp:402
 msgid "(E) empty map view"
 msgstr ""
 
 #. TRANSLATORS: map view type in status bar
-#: src/gamemodifiers.cpp:393
+#: src/gamemodifiers.cpp:404
 msgid "(b) black & white map view"
 msgstr ""
 
 #. TRANSLATORS: pickup size in status bar
-#: src/gamemodifiers.cpp:395
+#: src/gamemodifiers.cpp:406
 msgid "(?) map view"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:407
+#: src/gamemodifiers.cpp:418
 msgid "(O) on keyboard"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
-#: src/gamemodifiers.cpp:409
+#: src/gamemodifiers.cpp:420
 msgid "(A) away"
 msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:471
+#: src/gamemodifiers.cpp:422 src/gamemodifiers.cpp:482
 msgid "(?) away"
 msgstr ""
 
 #. TRANSLATORS: away message box header
-#: src/gamemodifiers.cpp:437
+#: src/gamemodifiers.cpp:448
 msgid "Away"
 msgstr "距离"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:467
+#: src/gamemodifiers.cpp:478
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:469
+#: src/gamemodifiers.cpp:480
 msgid "(F) free camera mode"
 msgstr ""
 
@@ -1728,7 +1745,7 @@ msgstr "说话"
 #: src/gui/popups/popupmenu.cpp:263 src/gui/popups/popupmenu.cpp:2380
 #: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
-#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:238
+#: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:244
 #: src/resources/db/npcdb.cpp:148
 msgid "Buy"
 msgstr "购买"
@@ -1745,7 +1762,7 @@ msgstr "购买"
 #: src/gui/popups/popupmenu.cpp:266 src/gui/popups/popupmenu.cpp:2392
 #: src/gui/widgets/selldialog.cpp:52 src/gui/widgets/selldialog.cpp:99
 #: src/gui/windows/buyselldialog.cpp:73 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:149
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:149
 msgid "Sell"
 msgstr "出售"
 
@@ -2729,7 +2746,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:101 src/gui/windows/buydialog.cpp:277
 #: src/gui/windows/quitdialog.cpp:50 src/gui/windows/quitdialog.cpp:55
 #: src/gui/windows/quitdialog.cpp:57 src/gui/windows/serverdialog.cpp:113
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Quit"
 msgstr "退出"
 
@@ -2742,7 +2759,7 @@ msgstr "退出"
 #: src/gui/widgets/selldialog.cpp:119 src/gui/windows/buydialog.cpp:269
 #: src/gui/windows/itemamountwindow.cpp:177
 #: src/gui/windows/itemamountwindow.cpp:212 src/gui/windows/npcdialog.cpp:108
-#: src/gui/windows/statuswindow.cpp:765
+#: src/gui/windows/statuswindow.cpp:766
 msgid "+"
 msgstr "+"
 
@@ -2755,7 +2772,7 @@ msgstr "+"
 #: src/gui/widgets/selldialog.cpp:121 src/gui/windows/buydialog.cpp:272
 #: src/gui/windows/itemamountwindow.cpp:175
 #: src/gui/windows/itemamountwindow.cpp:209 src/gui/windows/npcdialog.cpp:110
-#: src/gui/windows/statuswindow.cpp:778
+#: src/gui/windows/statuswindow.cpp:779
 msgid "-"
 msgstr "-"
 
@@ -2766,7 +2783,7 @@ msgstr "-"
 #. TRANSLATORS: status bar label
 #: src/gui/widgets/selldialog.cpp:123 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/statuswindow.cpp:502 src/gui/windows/statuswindow.cpp:558
-#: src/gui/windows/statuswindow.cpp:762 src/gui/windows/statuswindow.cpp:794
+#: src/gui/windows/statuswindow.cpp:763 src/gui/windows/statuswindow.cpp:795
 msgid "Max"
 msgstr "最大"
 
@@ -5567,7 +5584,7 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:117
-#: src/gui/windows/charcreatedialog.cpp:501
+#: src/gui/windows/charcreatedialog.cpp:509
 #, c-format
 msgid "Please distribute %d points"
 msgstr "请分发%d点数"
@@ -5600,17 +5617,17 @@ msgid "U"
 msgstr ""
 
 #. TRANSLATORS: char creation error
-#: src/gui/windows/charcreatedialog.cpp:380
+#: src/gui/windows/charcreatedialog.cpp:388
 msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字需要至少4个字符."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:491
+#: src/gui/windows/charcreatedialog.cpp:499
 msgid "Character stats OK"
 msgstr "角色状态可以"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:507
+#: src/gui/windows/charcreatedialog.cpp:515
 #, c-format
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
@@ -6808,27 +6825,27 @@ msgstr "更新..."
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: src/gui/windows/updaterwindow.cpp:406
+#: src/gui/windows/updaterwindow.cpp:410
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:836
+#: src/gui/windows/updaterwindow.cpp:845
 msgid "##1  The update process is incomplete."
 msgstr "##1 更新过程不完整."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:838
+#: src/gui/windows/updaterwindow.cpp:847
 msgid "##1  It is strongly recommended that"
 msgstr "##1 强烈建议"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:840
+#: src/gui/windows/updaterwindow.cpp:849
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1024
+#: src/gui/windows/updaterwindow.cpp:1033
 msgid "Completed"
 msgstr "已完成"
 
@@ -6982,86 +6999,92 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Change targeting type"
+msgstr "更改移动到目标类型"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Other Keys"
 msgstr "其他按键"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Pickup"
 msgstr "捡起"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Change Pickup Type"
 msgstr "更改皮卡型"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Sit"
 msgstr "坐下"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Screenshot"
 msgstr "屏幕快照"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Enable/Disable Trading"
 msgstr "开启/关闭交易"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Change Map View Mode"
 msgstr "更改地图浏览模式"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Select OK"
 msgstr "选择OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:220
+#: src/input/pages/basic.cpp:226
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:250
+#: src/input/pages/basic.cpp:256
 msgid "Open context menu"
 msgstr ""
author	Andrei Karas <akaras@inbox.ru>	2015-07-26 19:04:51 +0300
committer	Andrei Karas <akaras@inbox.ru>	2015-07-26 19:04:51 +0300
commit	d97569a88e332f682f3b668012b5ad502529d5bf (patch)
tree	08c293f3d101d6efbeff290c28f4c9467084d96e
parent	8c3d197dbdfc00969f30309ee7bf52656b33ed1b (diff)
download	manaverse-d97569a88e332f682f3b668012b5ad502529d5bf.tar.gz manaverse-d97569a88e332f682f3b668012b5ad502529d5bf.tar.bz2 manaverse-d97569a88e332f682f3b668012b5ad502529d5bf.tar.xz manaverse-d97569a88e332f682f3b668012b5ad502529d5bf.zip