Update translations.

author: Andrei Karas <akaras@inbox.ru> 2016-02-10 19:35:56 +0300
committer: Andrei Karas <akaras@inbox.ru> 2016-02-10 19:35:56 +0300
commit: dde9d0d8a9b803ed5e78797ebb5ab0db5fddf662 (patch)
tree: 1dd9bb3acb840667636bcd678ceced0d8aead7d4 /po
parent: c10177d08a6185431559bea19a296f2f7934340e (diff)
download: plus-dde9d0d8a9b803ed5e78797ebb5ab0db5fddf662.tar.gz
plus-dde9d0d8a9b803ed5e78797ebb5ab0db5fddf662.tar.bz2
plus-dde9d0d8a9b803ed5e78797ebb5ab0db5fddf662.tar.xz
plus-dde9d0d8a9b803ed5e78797ebb5ab0db5fddf662.zip
23 files changed, 7201 insertions, 6162 deletions
diff --git a/po/ca.po b/po/ca.po
index 42f234074..594df1828 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: 2016-01-30 15:18+0300\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
 "PO-Revision-Date: 2016-01-30 09:31+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr "Arxiu enviat"
 
@@ -34,15 +34,15 @@ msgstr "Arxiu enviat"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -62,46 +62,57 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr "Memòria clau buidada"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Temps d'activitat del client: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "Imatges de recurs:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "Imatges de recurs orfes:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr "Configuració enviada a:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr "Configuració de servidor enviada a:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr "Registre pujat a:"
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+msgid "You not saw this nick."
+msgstr ""
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "Xiuxiuejant a %s: %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -271,7 +282,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "Visible al mapa"
 
@@ -290,12 +301,12 @@ msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "I"
 
@@ -306,53 +317,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "Has intentat agafar un objecte inexistent."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "L'objecte es massa pesant."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "L'objecte esta massa lluny."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "L'inventari està complet."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "La pila d'objectes es massa gran."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "L'objecte pertany a una altra persona."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "Problema desconegut al agafar l'objecte."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -361,53 +372,53 @@ msgstr[1] "Has recollit %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "treball"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -417,8 +428,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Ignorar completament"
 
@@ -460,7 +471,7 @@ msgstr ""
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Vídeo"
 
@@ -507,7 +518,7 @@ msgstr "Ajuda"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Tancar"
@@ -736,7 +747,6 @@ msgstr ""
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s no existeix i no pot ser creat! Sortint."
@@ -758,6 +768,12 @@ msgstr "Error creant el directori d'actualitzacions!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: %s no existeix i no pot ser creat! Sortint."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s no existeix i no pot ser creat! Sortint."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -775,36 +791,36 @@ msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Error al guardar la captura de pantalla!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "S'ha perdut la connexió amb el servidor."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Error de xarxa"
 
@@ -1212,7 +1228,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr ""
 
@@ -1396,8 +1412,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1729,14 +1745,14 @@ msgstr "Crear grup"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1876,11 +1892,11 @@ msgstr "Parlar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1894,10 +1910,10 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Vendre"
@@ -1907,7 +1923,7 @@ msgstr "Vendre"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr ""
 
@@ -1933,7 +1949,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr ""
 
@@ -2017,8 +2033,8 @@ msgstr "Jugadors"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr ""
 
@@ -2031,7 +2047,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Afegir al xat"
 
@@ -2046,8 +2062,8 @@ msgstr "Element del mapa"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr ""
 
@@ -2055,7 +2071,7 @@ msgstr ""
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr ""
 
@@ -2097,7 +2113,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Netejar"
 
@@ -2150,8 +2166,8 @@ msgstr "Deixa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2237,9 +2253,9 @@ msgstr "Agregar-los tots al intercanvi"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Botiga"
 
@@ -2312,9 +2328,9 @@ msgstr "Recupera-ho tot"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2322,46 +2338,46 @@ msgid "Use"
 msgstr "Utilitzar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Amagar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr ""
 
@@ -2369,30 +2385,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2400,7 +2416,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2409,135 +2425,135 @@ msgstr "Nivell: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "Deixar caure..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr ""
 
@@ -2545,67 +2561,67 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "Deixar caure"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2672,7 +2688,7 @@ msgstr "Xat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2959,19 +2975,19 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Diners: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr ""
 
@@ -2982,7 +2998,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -2998,7 +3014,7 @@ msgstr "Afegeix"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Sortir"
 
@@ -3010,7 +3026,7 @@ msgstr "Sortir"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3022,7 +3038,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3994,30 +4010,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "Permet finestra d'intercanvi"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4026,12 +4048,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4040,12 +4062,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4056,12 +4078,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4531,7 +4553,7 @@ msgstr "Permet mode botiga"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4910,21 +4932,26 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
-msgid "Use special diagonal speed in players moving"
+msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:128
-msgid "Log players actions (for GM)"
+msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:132
-msgid "Create screenshots for each complete trades"
+msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:136
+msgid "Create screenshots for each complete trades"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5062,8 +5089,8 @@ msgstr "Tema canviat"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Reinicia el client per que els canvis tinguin efecte."
 
@@ -5144,61 +5171,61 @@ msgid "Button %u action"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "Pantalla completa"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "Límit d'FPS:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Límit d'FPS alternatiu: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Ratolí personalitzat"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "Res"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5206,7 +5233,7 @@ msgstr ""
 "fallat!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5214,43 +5241,43 @@ msgstr ""
 "també ha fallat!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "Canviant a pantalla completa"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "Reinici requerit per que els canvis tinguin efecte."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "Canviant a OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicar un canvi a OpenGL requereix reinici."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolució personalitzada (exemple: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "Entra nova resolució:                "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "La resolució de la pantalla ha canviat"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algunes finestres poden ser mogudes per adaptar-se a la resolució més baixa."
@@ -6104,25 +6131,36 @@ msgid "Enter password:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Present: %s; %d jugadors estan presents."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Xiuxiuejant a %s: %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "Moure"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6285,12 +6323,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6496,7 +6534,7 @@ msgid "Update host: %s"
 msgstr ""
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr ""
 
@@ -6656,22 +6694,22 @@ msgid "Job level: %d"
 msgstr "Nivell de treball: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Següent"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Envia"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Reajustar"
 
@@ -6839,7 +6877,7 @@ msgid "Reset Windows"
 msgstr "Restaurar finestres"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "Botiga personal"
 
@@ -6871,40 +6909,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Petició d'intercanvi"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6939,13 +6977,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7268,7 +7306,7 @@ msgid "Completed"
 msgstr "Complet"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "Qui Està en Línia - Actualitzant"
 
@@ -7283,12 +7321,12 @@ msgid "Who Is Online - "
 msgstr "Qui Està En Línia - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "Qui Està En Línia - error"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "Qui Està En Línia - Actualitza"
 
@@ -7310,25 +7348,25 @@ msgstr "Tria Món"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7336,7 +7374,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -7417,91 +7455,97 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Gremi del objectiu:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "Agafa"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "Canvia el mode de recollir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "Assentat"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "Captura de pantalla"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "Activa/Desactiva Intercanvis"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "Canviar mode de visionat de mapa"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "Selecciona OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr ""
 
@@ -9073,103 +9117,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10389,56 +10433,56 @@ msgstr ""
 "Les opcions per a /%s son \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "setmana %d"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr "%d setmanes"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "Dia %d"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr "%d dies"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "Hora %d"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr "%d hores"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "Minut %d"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuts"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "Segon  %d"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr "%d segons"
diff --git a/po/cs.po b/po/cs.po
index 2ce01563a..93c61b788 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: 2016-01-30 15:18+0300\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
 "PO-Revision-Date: 2016-01-30 09:31+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.com/akaras/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:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr "Soubor byl uploadován"
 
@@ -39,15 +39,15 @@ msgstr "Soubor byl uploadován"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -67,46 +67,58 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr "Vyrovnávací paměť vyčištěna"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Doba běhu klienta: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "Resource images:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "Resource orphaned images:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr "Systémové proměnné uloženy"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr "Nahráno nastavení do:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr "Nahráno nastavení serveru do:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr "Nahrány záznmy do:"
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+#, fuzzy
+msgid "You not saw this nick."
+msgstr "Neleze ukrást nic..."
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "Šeptání pro %s: %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -275,7 +287,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "Viditelný na mapě"
 
@@ -294,12 +306,12 @@ msgid "miss"
 msgstr "minutí"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "I"
 
@@ -310,53 +322,53 @@ msgid "You were killed by %s."
 msgstr "Byl jsi zabit %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "Snažili jste se sebrat neexistující předmět."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "Předmět je příliš těžký."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "Předmět je příliš daleko."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "Inventář je plný."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "Hromada je příliš velká."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "Předmět patří někomu jinému."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr "Nemůžeš zvednout toto možství předmětů."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr "Tvůj počet předmětů dasáhl maxima."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "Neznámý problém při pokusu sebrat předmět."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -366,53 +378,53 @@ msgstr[2] "Sebral jsi %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "zk"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "práce"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr "Nasledovat: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "Následování zrušeno."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitace: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "Imitace zrušena."
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr "Vidíš %s"
@@ -422,8 +434,8 @@ msgstr "Vidíš %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Kompletně ignorovat"
 
@@ -465,7 +477,7 @@ msgstr "Výkon"
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Video"
 
@@ -512,7 +524,7 @@ msgstr "Nápověda"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zavřít"
@@ -742,7 +754,6 @@ msgstr "  -O --no-opengl      : Zakázat OpenGL pro toto sezení"
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s neexistuje a vytvoření selhalo. Končím."
@@ -764,6 +775,12 @@ msgstr "Chyba při vytváření adresáře s updaty!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s neexistuje a vytvoření selhalo. Končím."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -781,36 +798,36 @@ msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "Obecný"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Snímek obrazovky uložen jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Ukládání snímku obrazovky selhalo!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Spojení se serverem bylo ztraceno."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Chyba sítě"
 
@@ -1218,7 +1235,7 @@ msgstr "Zpráva"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr "Oživ"
 
@@ -1403,8 +1420,8 @@ msgstr "Maximální (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(výchozí)"
 
@@ -1736,14 +1753,14 @@ msgstr "Vytvořit partu"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1883,11 +1900,11 @@ msgstr "Promluv"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Nákup"
 
@@ -1901,10 +1918,10 @@ msgstr "Nákup"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Prodej"
@@ -1914,7 +1931,7 @@ msgstr "Prodej"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Přidat komentář"
 
@@ -1940,7 +1957,7 @@ msgstr "Přidat do seznamu útoku"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Vložit do seznamu ignorovaných"
 
@@ -2024,8 +2041,8 @@ msgstr "Hráči"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Vykopnout z party"
 
@@ -2038,7 +2055,7 @@ msgstr "Sebrat"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Přidat do chatu"
 
@@ -2053,8 +2070,8 @@ msgstr "Označit na mapě"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Odebrat"
 
@@ -2062,7 +2079,7 @@ msgstr "Odebrat"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr "Přesun"
 
@@ -2104,7 +2121,7 @@ msgstr "Upravit kouzlo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Vymazat"
 
@@ -2157,8 +2174,8 @@ msgstr "Opustit"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Kopírovat do schránky"
 
@@ -2244,9 +2261,9 @@ msgstr "Přidat vše k obchodu"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Uložit"
 
@@ -2319,9 +2336,9 @@ msgstr "Vzít všechny"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2329,46 +2346,46 @@ msgid "Use"
 msgstr "Použít"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Vyčistit okno upuštění"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Skrýt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Zobrazit"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "Resetovat žlutý pruh"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Zkopírovat do chatu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Posunout nahoru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Posunout dolů"
 
@@ -2376,30 +2393,30 @@ msgstr "Posunout dolů"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Svléknout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Kopírovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Vložit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Otevřít odkaz"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Zobrazit okno"
 
@@ -2407,7 +2424,7 @@ msgstr "Zobrazit okno"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2416,135 +2433,135 @@ msgstr "Úroveň: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Přehlížet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Černá listina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Nastavit jako nepřítele"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Vymazat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Být přátelé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Odignorovat"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Následovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Koupit (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Prodat (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Pozvat do party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr "Připojit k chatu %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Zobrazit předměty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Odeber ze seznamu sběru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Přidej do seznamu sběru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Přestat chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "Upustit..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Upustit vše"
 
@@ -2552,67 +2569,67 @@ msgstr "Upustit vše"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "Upustit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "GM příkazy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Zkontrolovat ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Jdi na"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Zavolej zpět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Vykopnout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2679,7 +2696,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2966,19 +2983,19 @@ msgstr "Úroveň: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Peníze: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr "Ob."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr "Otevři web adresu"
 
@@ -2989,7 +3006,7 @@ msgstr "Otevři web adresu"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -3005,7 +3022,7 @@ msgstr "Přidat"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Ukončit"
 
@@ -3017,7 +3034,7 @@ msgstr "Ukončit"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3029,7 +3046,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -4001,30 +4018,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "Povolit filtr útoku"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "Čas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "Použít místní čas"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr "Zvýrazňovaná slova (oddělená čárkou)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4033,12 +4056,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr "Globálně ignorovaná jména (oddělená čárkou)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4047,12 +4070,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr "Zobrazit knoflík pro smajlíky v chatu"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4063,12 +4086,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr "Zobrazit motto dne od serveru při startu"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4538,7 +4561,7 @@ msgstr "Zapnout mód obchodu"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4922,21 +4945,26 @@ msgstr "Skryj postavy smazaných hráčů"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
+msgid "Collect players id and seen log"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid "Use special diagonal speed in players moving"
 msgstr "Požít speciální diagonální rychlost pro pohyb hráčů"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:128
+#: src/gui/widgets/tabs/setup_players.cpp:132
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:132
+#: src/gui/widgets/tabs/setup_players.cpp:136
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:136
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5076,8 +5104,8 @@ msgstr "Téma změněno"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Restartujte klient pro aplikováni změn."
 
@@ -5158,68 +5186,68 @@ msgid "Button %u action"
 msgstr "Akce tlačítka %u"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "Celá obrazovka"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "Omezení FPS:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Altern. FPS omezení: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr "Detekuj nejlepší režim"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr "Zobrazit kurzor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Vlastní kurzor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr "Povolit změnu velikosti"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr "Žádný rámeček"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "Žádné"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Selhalo přepnutí do módu v okně a obnovení předchozího módu taktéž selhalo!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5227,43 +5255,43 @@ msgstr ""
 "selhalo!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "Přepínám na celou obrazovku"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "Pro uplatnění změn je potřeba restart."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "Měním na OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "Změny v OpenGL vyžadují restart."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Vlastní rozlišení (příklad: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "Zadej nové rozlišení:                "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "Rozlišení obrazovky změněno"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Některá okna mohou být přesunuta aby se vešla do menšího okna."
 
@@ -6121,25 +6149,36 @@ msgid "Enter password:"
 msgstr "Zadej heslo:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Přítomni: %s; %d hráčů je přítomno."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šeptání pro %s: %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "Jdi sem"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr "mazlíček patřící %s"
@@ -6302,12 +6341,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6515,7 +6554,7 @@ msgid "Update host: %s"
 msgstr "Host updatu: %s"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr "Otevřít registrační url"
 
@@ -6675,22 +6714,22 @@ msgid "Job level: %d"
 msgstr "Prácovní úroveň: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Zastavit čekání"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Další"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Odeslat"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Resetovat"
 
@@ -6858,7 +6897,7 @@ msgid "Reset Windows"
 msgstr "Resetovat okna"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "Osobní obchod"
 
@@ -6890,40 +6929,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Požadavek k obchodování"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6958,13 +6997,13 @@ msgid "Failed skill: %s"
 msgstr "Neúspěšná dovednost: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7285,7 +7324,7 @@ msgid "Completed"
 msgstr "Hotovo"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "Kdo je online - Obnovuji"
 
@@ -7300,12 +7339,12 @@ msgid "Who Is Online - "
 msgstr "Kdo je online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "Kdo je online - chyba"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "Kdo je přihlášený - Update"
 
@@ -7327,25 +7366,25 @@ msgstr "Vyber svět"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "kl_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr "Jknoflík%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr "neznámá klávesa"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr "JK%d"
@@ -7353,7 +7392,7 @@ msgstr "JK%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "n kl"
 
@@ -7434,91 +7473,97 @@ msgstr "Zaměř žoldáka"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Úroveň cíle:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr "Zaměř mazlíčka"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr "Chytit mazlíčka"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr "Ostatní klávesy"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "Sebrat"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "Změnit typ sběru"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "Sednout si"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "Snímek obrazovky"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "Zapnout/Vypnout obchody"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr "Otevřít okno obchodu"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr "Zahájit obchod se zacíleným"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr "Následovat vybraného hráče"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "Změnit mód zobrazení mapy"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "Vybrat OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr "Zastavit nebo posadit se"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 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:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr "Vyhodít človíčka"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr "Otevřít kontextové okno"
 
@@ -9096,103 +9141,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Nedosáhl jste ještě dostatečně vysoké úrovně!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Nedostatek životů (HP)!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Nedostatek bodů dovednosti (SP)!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Nemáte žádné zprávy!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Toto momentálně nemůžete udělat!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Vypadá to že potřebujete více peněz... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Nemůžete použít tuto dovednost s touto zbraní!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Potřebujete další rubín!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Potřebujete další safír!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Neseš příliš mnoho na to abys mohl udělat toto!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10411,56 +10456,56 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Volby k %s jsou \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d týdnů"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr "%d týdnů"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d dní"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr "%d dní"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d hodin"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr "%d hodin"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d minut"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d vteřinu"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr "%d vteřin"
diff --git a/po/de.po b/po/de.po
index f62f3249e..2d8ba9c87 100644
--- a/po/de.po
+++ b/po/de.po
@@ -28,15 +28,15 @@
 # Philipp <philipp.krueger1@googlemail.com>, 2012
 # Philipp <philipp.krueger1@googlemail.com>, 2012
 # Rosemarie Tauber <horos@online.de>, 2012
-# Suni <kristin.joris@gmail.com>, 2015
+# Suni <kristin.joris@gmail.com>, 2015-2016
 # Valsu <valsu@hylia.de>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-30 15:18+0300\n"
-"PO-Revision-Date: 2016-01-30 09:31+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
+"PO-Revision-Date: 2016-02-10 16:20+0000\n"
+"Last-Translator: Suni <kristin.joris@gmail.com>\n"
 "Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
 "de/)\n"
 "Language: de\n"
@@ -46,7 +46,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr "Datei hochgeladen"
 
@@ -59,15 +59,15 @@ msgstr "Datei hochgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -87,46 +87,58 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr "Zwischenspeicher geleert"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client läuft seit: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "Bild-Quellen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "Quelle verwaister Bilddataien:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr "Umgebungsvariablen ausgegeben"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr "Konfiguration hochgeladen zu:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr "Serverconfig hochgeladen zu:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr "Log hoch geladen zu:"
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+#, fuzzy
+msgid "You not saw this nick."
+msgstr "Konnte nichts stehlen..."
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "Flüstern zu %s: %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -297,7 +309,7 @@ msgid "Quick"
 msgstr "Schnell"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "Auf der Karte sichtbar"
 
@@ -316,12 +328,12 @@ msgid "miss"
 msgstr "verfehlt"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "I"
 
@@ -332,53 +344,53 @@ msgid "You were killed by %s."
 msgstr "Du wurdest von %s getötet."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "Du versuchst, einen nicht existierenden Gegenstand aufzuheben."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "Gegenstand ist zu schwer."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "Gegenstand ist zu weit weg."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "Inventar ist voll."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "Stapel ist zu groß."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "Gegenstand gehört jemand anderem."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr "Du kannst nicht diese Menge an Gegenständen aufnehmen."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr "Dein Gegenstandsstapel hat das Maximum erreicht."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "Fehler bei dem Aufheben des Items."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -387,53 +399,53 @@ msgstr[1] "Du hast %d [@@%d|%s@@] aufgehoben."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "EP"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "Job"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr "hp"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr "mana"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr "Folgen: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "Folgen abgebrochen"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitation: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "Imitation abgebrochen"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr "Du siehst %s"
@@ -443,8 +455,8 @@ msgstr "Du siehst %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Komplett ignorieren"
 
@@ -486,7 +498,7 @@ msgstr "Leistung"
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Video"
 
@@ -533,7 +545,7 @@ msgstr "Hilfe"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Schließen"
@@ -767,7 +779,6 @@ msgstr "  -O --no-opengl      : OpenGL für diese Sitzung deaktivieren"
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
@@ -789,6 +800,12 @@ msgstr "Fehler beim erstellen des Verzeichnisses für Updates!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fehler: %s existiert nicht und kann nicht erstellt werden! Beende..."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -806,36 +823,36 @@ msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "Allgemein"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Screenshot gespeichert unter %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Screenshot konnte nicht gespeichert werden!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Die Verbindung zum Server wurde getrennt."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Netzwerkfehler"
 
@@ -1243,7 +1260,7 @@ msgstr "Nachricht"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr "Wiederbeleben"
 
@@ -1431,8 +1448,8 @@ msgstr "Riesig (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(Normal)"
 
@@ -1764,14 +1781,14 @@ msgstr "Gruppe erstellen"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1911,11 +1928,11 @@ msgstr "Sprechen"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Kaufen"
 
@@ -1929,10 +1946,10 @@ msgstr "Kaufen"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Verkaufen"
@@ -1942,7 +1959,7 @@ msgstr "Verkaufen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Kommentar hinzufügen"
 
@@ -1968,7 +1985,7 @@ msgstr "Zur Angriffsliste hinzufügen"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Zur Ignorierenliste hinzufügen"
 
@@ -2052,8 +2069,8 @@ msgstr "Spieler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Aus Gruppe werfen"
 
@@ -2066,7 +2083,7 @@ msgstr "Aufheben"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Zum Chat hinzufügen"
 
@@ -2081,8 +2098,8 @@ msgstr "Kartengegenstand"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -2090,7 +2107,7 @@ msgstr "Entfernen"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr "Teleport"
 
@@ -2132,7 +2149,7 @@ msgstr "Zauberspruch bearbeiten"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Leeren"
 
@@ -2185,8 +2202,8 @@ msgstr "Verlassen"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage kopieren"
 
@@ -2272,9 +2289,9 @@ msgstr "Alles zum Handeln hinzufügen"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Aufbewahren"
 
@@ -2306,7 +2323,7 @@ msgstr "Alles aufbewahren"
 #. TRANSLATORS: sub menu for craft
 #: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr ""
+msgstr "Zum Herstellen bewegen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
@@ -2347,9 +2364,9 @@ msgstr "Alles abholen"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2357,46 +2374,46 @@ msgid "Use"
 msgstr "Benutzen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Fenster: Wegwerfen leeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Verstecke"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Zeige"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr "Einstellungen des gelben Balkens öffnen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "Gelben Balken zurücksetzen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Zu Chat kopieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Nach oben bewegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Nach unten bewegen"
 
@@ -2404,30 +2421,30 @@ msgstr "Nach unten bewegen"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Ausziehen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Kopieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Einfügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Link öffnen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Fenster anzeigen"
 
@@ -2435,7 +2452,7 @@ msgstr "Fenster anzeigen"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2444,135 +2461,135 @@ msgstr "Stufe: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr "Max Level"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Missachten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Schwarze Liste"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Als Feind setzen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Löschen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Befreunden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Nicht mehr Ignorieren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Folgen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr "Imitieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Kaufen (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Verkaufen (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Zu Gruppe einladen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr "Chat beitreten %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Gegenstände anzeigen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Von der Aufhebeliste entfernen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Zur Aufhebeliste hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Gegenstand nicht mehr schützen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Gegenstand schützen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "Wegwerfen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Alles wegwerfen"
 
@@ -2580,70 +2597,70 @@ msgstr "Alles wegwerfen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "Wegwerfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "GM...."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "GM Befehle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "IP überprüfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Gehe zu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Zurückrufen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Rauswerfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr "Stummschalten %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr "Laut schalten %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
-msgstr ""
+msgstr "Bewege %d zum Herzustellen"
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -2680,7 +2697,7 @@ msgstr "Fenster"
 #. TRANSLATORS: inventory type name
 #: src/gui/setupinputpages.cpp:52 src/resources/inventory/inventory.cpp:336
 msgid "Craft"
-msgstr ""
+msgstr "Handwerk"
 
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: emotes window name
@@ -2707,7 +2724,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2994,19 +3011,19 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr "Eq."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr "URL öffnen"
 
@@ -3017,7 +3034,7 @@ msgstr "URL öffnen"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -3033,7 +3050,7 @@ msgstr "Hinzufügen"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Beenden"
 
@@ -3045,7 +3062,7 @@ msgstr "Beenden"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3057,7 +3074,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -4141,18 +4158,24 @@ msgstr ""
 "Hinweis:  Es geht um sprunghaftes Verhalten des Chats gegen weniger "
 "nutzbaren Platz für Text."
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "Angriffsfilter aktivieren"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "Zeit"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "Lokale Zeit benutzen"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
@@ -4161,12 +4184,12 @@ msgstr ""
 "Zeit. Wenn deaktiviert, wird die Serverzeit benutzt (oftmals ist das GMT+0)."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr "Wörter hervorheben (Mit Komma trennen)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4179,12 +4202,12 @@ msgstr ""
 "Hinweis: Häufige Hervorhebungen sind lästig - benutze sie mit Bedacht."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr "Globale Nachrichten von Name ignorieren (Mit Komma trennen)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4199,12 +4222,12 @@ msgstr ""
 "wichtige Ankündigungen verpasst!"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr "Emotes im Chat anzeigen"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4222,12 +4245,12 @@ msgstr ""
 "schreibst, aufgerufen werden."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr "NdT Servernachricht beim Start anzeigen"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4700,7 +4723,7 @@ msgstr "Laden-Modus einschalten"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -5088,21 +5111,26 @@ msgstr "Gelöschte Spielernamen verstecken"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
+msgid "Collect players id and seen log"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid "Use special diagonal speed in players moving"
 msgstr "Besondere diagonale Geschwindigkeit bei Spielerbewegung benutzen"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:128
+#: src/gui/widgets/tabs/setup_players.cpp:132
 msgid "Log players actions (for GM)"
 msgstr "Spieleraktionen loggen (für GMs)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:132
+#: src/gui/widgets/tabs/setup_players.cpp:136
 msgid "Create screenshots for each complete trades"
 msgstr "Erstelle Bildschirmfoto für jeden abgeschlossenen Handel"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:136
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr "Rechtsklick bei langem Klick emulieren (nützlich für Touchpads)"
@@ -5240,8 +5268,8 @@ msgstr "Theme geändert"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Starte das Spiel neu, um die Änderungen zu übernehmen."
 
@@ -5322,61 +5350,61 @@ msgid "Button %u action"
 msgstr "Knopffunktion %u"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "Vollbild"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "FPS Grenze:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Alternative FPS Grenze: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr "Besten Modus ermitteln"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr "Zeiger anzeigen"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Benutzerdefinierter Zeiger"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr "Größenanpassung erlauben"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr "Kein Fensterrahmen"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "Kein(e)"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5384,7 +5412,7 @@ msgstr ""
 "Auflösung schlug fehl!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5392,45 +5420,45 @@ msgstr ""
 "Auflösung schlug fehl!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "Wechsle zum Vollbildmodus"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "Wechsle zu OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
 "übernommen."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Benutzerdefinierte Auflösung (zum Beispiel: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "Neue Auflösung eingeben:            "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "Bildschirmauflösung wurde geändert"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Einige Fenster könnten verschoben werden um in die herabgesetzte Auflösung "
@@ -6290,25 +6318,36 @@ msgid "Enter password:"
 msgstr "Gib dein Passwort ein:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Anwesend: %s ; %d Spieler sind anwesend."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Flüstern zu %s: %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "Bewegen"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr "Defekter Spielername entdeckt: "
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr "%ss Haustier"
@@ -6471,12 +6510,12 @@ msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr "Anfrage, Karte einzulegen"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "Lege %s in %s ein?"
@@ -6509,7 +6548,7 @@ msgstr "Anzahl der Gegenstände zum Senden auswählen."
 #. TRANSLATORS: amount window message
 #: src/gui/windows/itemamountwindow.cpp:269
 msgid "Select amount of items to craft."
-msgstr ""
+msgstr "Anzahl der Gegenstände zum herstellen auswählen."
 
 #. TRANSLATORS: amount window message
 #: src/gui/windows/itemamountwindow.cpp:274
@@ -6682,7 +6721,7 @@ msgid "Update host: %s"
 msgstr "Updateserver: %s"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr "Registrierungslink öffnen"
 
@@ -6842,22 +6881,22 @@ msgid "Job level: %d"
 msgstr "Job Level: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Warten stoppen"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Weiter"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Absenden"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Zurücksetzten"
 
@@ -7025,7 +7064,7 @@ msgid "Reset Windows"
 msgstr "Fenster zurücksetzen"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "Persönlicher Stand"
 
@@ -7057,40 +7096,40 @@ msgid "Unpublish"
 msgstr "Verstecke"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
-msgstr ""
+msgstr "Fehler: Spieler ist beschäftigt"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
-msgstr ""
+msgstr "Fehler: Kann diesen Gegenstand nicht verkaufen"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
-msgstr ""
+msgstr "Fehler: Kann diesen Gegenstand nicht kaufen"
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
-msgstr ""
+msgstr "%s möchte %s kaufen. Akzeptierst du?"
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
-msgstr ""
+msgstr "%s möchte %s verkaufen. Akzeptierst du?"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Handel anfordern"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Persönlicher Stand - %s"
@@ -7125,13 +7164,13 @@ msgid "Failed skill: %s"
 msgstr "Fähigkeit fehlgeschlagen: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Text zum Skill %s hinzufügen"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr "Text: "
 
@@ -7454,7 +7493,7 @@ msgid "Completed"
 msgstr "Fertig"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "Wer ist Online? - Aktualisierung"
 
@@ -7469,12 +7508,12 @@ msgid "Who Is Online - "
 msgstr "Wer ist Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "Wer ist Online - Fehler"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "Wer ist Online - Aktualisierung"
 
@@ -7496,25 +7535,25 @@ msgstr "Welt auswählen"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "Taste_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr "JKnopf%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr "Unbekannte Taste"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr "JK%d"
@@ -7522,7 +7561,7 @@ msgstr "JK%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "UTaste"
 
@@ -7603,91 +7642,97 @@ msgstr "Söldner anvisieren"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Fähigkeitseinheit"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr "Art des Zielens ändern"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr "Haustier anvisieren"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr "Haustier fangen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr "Andere Tasten"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "Aufheben"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "Aufheben-Typ ändern"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "Sitzen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "Screenshot"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "Handeln erlauben/verbieten"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr "Handelsfenster öffnen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr "Handel mit Ziel starten"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr "Anvisierten Spieler folgen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "Kartenansichtsmodus ändern"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "OK auswählen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr "Stoppen oder Sitzen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr "Zum sicheren Videomodus zurückkehren"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr "Humunkulus feuern"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr "Kontextmenü öffnen"
 
@@ -7824,7 +7869,7 @@ msgstr "Smilies anzeigen"
 #: src/input/pages/craft.cpp:80
 #, c-format
 msgid "Craft shortcut %d"
-msgstr ""
+msgstr "Herstellungs Kurzbefehl %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -8828,7 +8873,7 @@ msgstr "Du wurdest für immer vom Spiel gebannt. Bitte kontaktiere das GM-Team."
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
 msgid "Client too old or wrong server type."
-msgstr ""
+msgstr "Klient ist zu alt oder falscher Servertyp."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9263,106 +9308,106 @@ msgstr "Du hast eine neue Nachricht von %s mit dem Betreff %s"
 #: src/net/eathena/petrecv.cpp:72
 #, c-format
 msgid "hungry level %d"
-msgstr ""
+msgstr "Hungerlevel %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Unbekannter Fähigkeitsfehler: %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr "Unbekannter Fähigkeitsfehler: %d."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Dein Level ist noch nicht hoch genug!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Unzureichende HP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Unzureichende SP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Du hast keine Erinnerungen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Das kannst du im Moment nicht tun!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Sieht aus, als ob du mehr Geld brauchst.... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kannst die Fähigkeit nicht mit dieser Art von Waffe benutzen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Du brauchst ein weiteres rotes Juwel!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Du brauchst ein weiteres blaues Juwel!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Du trägst zu viel mit dir herum, um das zu tun!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr "Beschwörung fehlgeschlagen."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr "Geister benötigt."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr "Gegenstand %s benötigt."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr "Gegenstand %s und Menge %d benötigt."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr "Gegenstand %s benötigt."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr "Gegenstand %s benötigt und Menge %d"
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr "Warp Ziel auswählen"
 
@@ -10087,7 +10132,7 @@ msgstr "Haustierfang fehlgeschlagen."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:378
 msgid "Pet caught."
-msgstr ""
+msgstr "Haustier gefangen."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:382
@@ -10599,56 +10644,56 @@ msgstr ""
 "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d Wochen"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr "%d Wochen"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d Tage"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr "%d Tage"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d Stunden"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr "%d Stunden"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d Minuten"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr "%d Minuten"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d Sekunden"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
diff --git a/po/es.po b/po/es.po
index 1e06070c3..9f976fa4b 100644
--- a/po/es.po
+++ b/po/es.po
@@ -17,13 +17,14 @@
 # osuka <owen942009@gmail.com>, 2013-2014
 # osuka <owen942009@gmail.com>, 2012-2013
 # 0x0Eddine <salahbubuli44@gmail.com>, 2012,2014
+# Scall, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-30 15:18+0300\n"
-"PO-Revision-Date: 2016-01-30 09:31+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
+"PO-Revision-Date: 2016-02-06 09:20+0000\n"
+"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
 "es/)\n"
 "Language: es\n"
@@ -33,7 +34,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr "Archivo subido"
 
@@ -46,15 +47,15 @@ msgstr "Archivo subido"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -74,46 +75,58 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr "Caché limpiada"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tiempo de actividad del cliente: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "Imágenes de recurso:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr "Variables de entorno vaciadas"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr "Configuraciones subidas a:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr "Configuraciones del servidor subidas a:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr "Registro subido a:"
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+#, fuzzy
+msgid "You not saw this nick."
+msgstr "No puedes robar nada..."
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "Susurrando a %s: %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -283,7 +296,7 @@ msgid "Quick"
 msgstr "Rápido"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "Visibles en el mapa"
 
@@ -302,12 +315,12 @@ msgid "miss"
 msgstr "falla"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "I"
 
@@ -318,53 +331,53 @@ msgid "You were killed by %s."
 msgstr "Fuiste asesinado por %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistente."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr "No puedes recoger esta cantidad de objetos."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr "Tu montón de objetos esta al máximo."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "Problema desconocido al intentar recoger el artículo."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -373,53 +386,53 @@ msgstr[1] "Recogiste %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "exp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "trabajo"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr "hp"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr "maná"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguir: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "Seguimiento cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitación: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr "Tú ves %s"
@@ -429,8 +442,8 @@ msgstr "Tú ves %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -472,7 +485,7 @@ msgstr "Rendimiento"
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Video"
 
@@ -519,7 +532,7 @@ msgstr "Ayuda"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Cerrar"
@@ -751,7 +764,6 @@ msgstr "  -O --no-opengl: Deshabilitar OpenGL para esta sesión"
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "¡%s no existe y no puede ser creado! Saliendo."
@@ -773,6 +785,12 @@ msgstr "¡Error al crear la carpeta de actualizaciones!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "¡%s no existe y no puede ser creado! Saliendo."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -790,36 +808,36 @@ msgstr "dyecmd archivoOrigen archivoDestino"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de pantalla guardada como %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 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:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Error de Red"
 
@@ -1227,7 +1245,7 @@ msgstr "Mensaje"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr "Revivir"
 
@@ -1414,8 +1432,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(predeterminado)"
 
@@ -1747,14 +1765,14 @@ msgstr "Crear grupo"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1894,11 +1912,11 @@ msgstr "Hablar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1912,10 +1930,10 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Vender"
@@ -1925,7 +1943,7 @@ msgstr "Vender"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Agregar comentario"
 
@@ -1951,7 +1969,7 @@ msgstr "Agregar a la lista de ataque"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Agregar a la lista de ignorados"
 
@@ -2035,8 +2053,8 @@ msgstr "Jugadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Expulsar del grupo"
 
@@ -2049,7 +2067,7 @@ msgstr "Recoger"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
@@ -2064,8 +2082,8 @@ msgstr "Mapa Objeto"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Quitar"
 
@@ -2073,7 +2091,7 @@ msgstr "Quitar"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr "Saltar a"
 
@@ -2115,7 +2133,7 @@ msgstr "Editar hechizo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Limpiar"
 
@@ -2168,8 +2186,8 @@ msgstr "Dejar"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
@@ -2255,9 +2273,9 @@ msgstr "Agregar todo al intercambio"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Almacenar"
 
@@ -2330,9 +2348,9 @@ msgstr "Recuperar todo"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2340,46 +2358,46 @@ msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Limpiar ventana de drop"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr "Abrir configuraciones de la barra amarilla"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "Restablecer barra amarilla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Subir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Bajar"
 
@@ -2387,30 +2405,30 @@ msgstr "Bajar"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Desvestir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Abrir enlace"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Mostrar ventana"
 
@@ -2418,7 +2436,7 @@ msgstr "Mostrar ventana"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2427,135 +2445,135 @@ msgstr "Nivel: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr "Nivel máximo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Desatender"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Lista negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Fijar como enemigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Borrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Ser amigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Dejar de ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Invitar al grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr "Unirse al chat %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Mostrar vestimenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Remover de lista de recogido"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Agregar a lista de recogido"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Desproteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Proteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "Tirar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Tirar todo"
 
@@ -2563,67 +2581,67 @@ msgstr "Tirar todo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "Tirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "Comandos GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Chequear IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Ir a"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Llamar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Expulsar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr "Enmudecer %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr "Desenmudecer %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2690,7 +2708,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2977,19 +2995,19 @@ msgstr "Nivel: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Dinero: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr "Eq."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr "Abrir url"
 
@@ -3000,7 +3018,7 @@ msgstr "Abrir url"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -3016,7 +3034,7 @@ msgstr "Añadir"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Salir"
 
@@ -3028,7 +3046,7 @@ msgstr "Salir"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3040,7 +3058,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -4039,18 +4057,24 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "Habilitar filtro de ataque"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "Tiempo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "Usar hora local"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
@@ -4060,12 +4084,12 @@ msgstr ""
 "es GTM+0)."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr "Resaltar palabras (separadas por coma)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4074,12 +4098,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr "Ignorar nombres globalmente (separados por coma)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4088,12 +4112,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr "Mostrar botón de emoticonos en el chat"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4104,12 +4128,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr "Mostrar el mensaje motd del servidor al iniciar"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4582,7 +4606,7 @@ msgstr "Habilitar la tienda"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4966,21 +4990,26 @@ msgstr "Ocultar los nicks de jugadores borrados"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
+msgid "Collect players id and seen log"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid "Use special diagonal speed in players moving"
 msgstr "Usar velocidad diagonal especial en movimiento de jugadores"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:128
+#: src/gui/widgets/tabs/setup_players.cpp:132
 msgid "Log players actions (for GM)"
 msgstr "Registrar acciones de jugadores (para GM)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:132
+#: src/gui/widgets/tabs/setup_players.cpp:136
 msgid "Create screenshots for each complete trades"
 msgstr "Crear capturas de pantalla para cada intercambio completado"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:136
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5120,8 +5149,8 @@ msgstr "Tema cambiado"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Reinicia el cliente para que los cambios surtan efecto."
 
@@ -5202,61 +5231,61 @@ msgid "Button %u action"
 msgstr "Acción del botón %u"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "Pantalla completa"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "Límite de FPS:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Límite alternativo de FPS: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr "Detectar el mejor modo"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr "Mostrar cursor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Cursor personalizado"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr "Permitir cambio de tamaño"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr "Sin marco"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "Nada"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5264,7 +5293,7 @@ msgstr ""
 "también falló!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5272,43 +5301,43 @@ msgstr ""
 "modo anterior también falló!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "Cambiando a pantalla completa"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "Reinicio necesario para que los cambios surtan efecto."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "Cambiando a OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "Se necesita reiniciar para aplicar el cambio a OpenGL."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolución personalizada (ejemplo: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "Ingrese la nueva resolución:        "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "Resolución de pantalla cambiada"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algunas ventanas pueden ser movidas para adaptarlas a la resolución más baja."
@@ -6171,25 +6200,36 @@ msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jugadores están presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Susurrando a %s: %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "Mover"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr "Nombre roto detectado: "
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr "Mascota de %s"
@@ -6353,12 +6393,12 @@ msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr "Inserta la tarjeta requerida"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "¿Insertar %s en %s?"
@@ -6564,7 +6604,7 @@ msgid "Update host: %s"
 msgstr "Host de actualización: %s"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr "Abrir url de registro"
 
@@ -6724,22 +6764,22 @@ msgid "Job level: %d"
 msgstr "Nivel de trabajo: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Dejar de esperar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Siguiente"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Enviar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Restablecer"
 
@@ -6909,7 +6949,7 @@ msgid "Reset Windows"
 msgstr "Restablecer ventanas"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "Tienda personal"
 
@@ -6941,40 +6981,40 @@ msgid "Unpublish"
 msgstr "Des-publicar"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr "error: jugador ocupado"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr "error: No se puede vender este artículo"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr "error: No se puede comprar este artículo"
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr "%s quiere comprarte %s ¿aceptas?"
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr "%s quiere venderte %s ¿aceptas?"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Propuesta de intercambio"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Tienda Personal - %s"
@@ -7009,13 +7049,13 @@ msgid "Failed skill: %s"
 msgstr "Habilidad fallida: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Añadir texto a la habilidad %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr "Texto: "
 
@@ -7338,7 +7378,7 @@ msgid "Completed"
 msgstr "Completado"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "Quién está conectado - Actualizando"
 
@@ -7353,12 +7393,12 @@ msgid "Who Is Online - "
 msgstr "Quién está conectado - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "Quién está conectado - error"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "Quién está conectado - Actualizar"
 
@@ -7380,25 +7420,25 @@ msgstr "Escoger Mundo"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr "tecla desconocida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7406,7 +7446,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "desc."
 
@@ -7487,91 +7527,97 @@ msgstr "Apuntar a mercenario"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Unidad de Habilidad"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr "Cambiar el tipo de objetivo"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr "Apuntar mascota"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr "Capturar mascota"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr "Otras Teclas"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "Recoger"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "Cambiar el tipo de recogida"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "Sentarse"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "Capturar pantalla"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Deshabilitar intercambios"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr "Abrir ventana de intercambio"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr "Iniciar intercambio con el objetivo"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr "Seguir al jugador seleccionado"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "Cambiar el modo de vista del mapa"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "Seleccionar OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr "Detener o sentar"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr "Volver a modo de video seguro"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr "Disparar con tu homúnculo"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr "Abrir menú contextual"
 
@@ -9151,103 +9197,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Error de habilidad desconocido: %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr "Error de habilidad desconocido: %d."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "¡Aún no has alcanzado un nivel lo suficientemente alto!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "¡Insuficiente HP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "¡SP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "¡No tienes ningún memo!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "¡No puedes hacer esto ahora mismo!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que necesitas más dinero... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "¡No puedes usar esta habilidad con este tipo de arma!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "¡Necesitas otra gema roja!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "¡Necesitas otra gema azul!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "¡Estás llevando muchas cosas para hacer esto!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10477,56 +10523,56 @@ msgstr ""
 "Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d semanas"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr "%d semanas"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d días"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr "%d días"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d horas"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr "%d horas"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d minutos"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d segundos"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
diff --git a/po/fi.po b/po/fi.po
index e1bd1f54c..be49daebd 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: 2016-01-30 15:18+0300\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
 "PO-Revision-Date: 2016-01-30 09:31+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr ""
 
@@ -34,15 +34,15 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -62,46 +62,58 @@ msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Ohjelma ollut käynnissä: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "Resurssikuvat:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr ""
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+#, fuzzy
+msgid "You not saw this nick."
+msgstr "Varastaminen ei onnistunut..."
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "Kuiskaat pelaajalle %s: %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -270,7 +282,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "Näkyvillä kartalla"
 
@@ -289,12 +301,12 @@ msgid "miss"
 msgstr "huti"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "P"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "-"
 
@@ -305,53 +317,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit poimia olemattoman tavaran."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "Tuntematon ongelma esti tavaran poimimisen."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -360,53 +372,53 @@ msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -416,8 +428,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
@@ -459,7 +471,7 @@ msgstr ""
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Kuva"
 
@@ -506,7 +518,7 @@ msgstr "Apua"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sulje"
@@ -736,7 +748,6 @@ msgstr ""
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
@@ -758,6 +769,12 @@ msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -775,36 +792,36 @@ msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "Yleiset"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Yhteys palvelimeen katkesi."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
@@ -1212,7 +1229,7 @@ msgstr "Viesti"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr ""
 
@@ -1396,8 +1413,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(oletus)"
 
@@ -1729,14 +1746,14 @@ msgstr "Luo ryhmä"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1876,11 +1893,11 @@ msgstr "Keskustele"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Osta"
 
@@ -1894,10 +1911,10 @@ msgstr "Osta"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Myy"
@@ -1907,7 +1924,7 @@ msgstr "Myy"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Lisää kommentti"
 
@@ -1933,7 +1950,7 @@ msgstr "Lisää hyökkäyslistaan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Lisää ohitettavien listaan"
 
@@ -2017,8 +2034,8 @@ msgstr "Pelaajat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Potki ryhmästä"
 
@@ -2031,7 +2048,7 @@ msgstr "Poimi"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Lisää keskusteluun"
 
@@ -2046,8 +2063,8 @@ msgstr "Karttaolio"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Poista"
 
@@ -2055,7 +2072,7 @@ msgstr "Poista"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr "Warppaa"
 
@@ -2097,7 +2114,7 @@ msgstr "Muokkaa loitsua"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Tyhjennä"
 
@@ -2150,8 +2167,8 @@ msgstr "Eroa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Kopioi leikepöydälle"
 
@@ -2237,9 +2254,9 @@ msgstr "Lisää kaikki kauppaan"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Varastoi"
 
@@ -2312,9 +2329,9 @@ msgstr "Ota kaikki"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2322,46 +2339,46 @@ msgid "Use"
 msgstr "Käytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Piilota"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Näytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Kopioi keskusteluun"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Siirrä ylös"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Siirrä alas"
 
@@ -2369,30 +2386,30 @@ msgstr "Siirrä alas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Riisu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2400,7 +2417,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2409,135 +2426,135 @@ msgstr "Taso: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Vaimenna"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ohita"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Musta lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Aseta viholliseksi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Pyyhi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Ystävysty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Huomioi jälleen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Seuraa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Osta (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Myy (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Kutsu ryhmään"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Näytä tavarat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "Pudota..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Pudota kaikki"
 
@@ -2545,67 +2562,67 @@ msgstr "Pudota kaikki"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "Pudota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Potki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2672,7 +2689,7 @@ msgstr "Keskustelu"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2959,19 +2976,19 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Rahat: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr ""
 
@@ -2982,7 +2999,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -2998,7 +3015,7 @@ msgstr "Lisää"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Sulje"
 
@@ -3010,7 +3027,7 @@ msgstr "Sulje"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3022,7 +3039,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3994,30 +4011,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "Ota käyttöön hyökkäyssuodin"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "Aika"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "Käytä paikallista aikaa"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr "Korosta sanat (pilkuin erotettu)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4026,12 +4049,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4040,12 +4063,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4056,12 +4079,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4531,7 +4554,7 @@ msgstr "Ota kauppatila käyttöön"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "Ei-pelaajahahmo (NPC)"
 
@@ -4910,21 +4933,26 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
-msgid "Use special diagonal speed in players moving"
+msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:128
-msgid "Log players actions (for GM)"
+msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:132
-msgid "Create screenshots for each complete trades"
+msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:136
+msgid "Create screenshots for each complete trades"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5062,8 +5090,8 @@ msgstr "Ulkoasua muutettu"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
 
@@ -5144,109 +5172,109 @@ msgid "Button %u action"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "Kokoruututila"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "Piirtonopeusrajoitin (FPS):"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Vaihtoehtoinen FPS-rajoitin: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Tyylitelty hiiren osoitin"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "-"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Kokoruututilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "Vaihdan kokoruututilaan"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "Vaihdetaan käyttämään OpenGL:ää"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL -asetuksen muutos vaatii ohjelman uudelleenkäynnistyksen."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Oma tarkkuus (esim. 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "Anna uusi tarkkuus:                  "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "Ikkunan koko vaihdettu"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
@@ -6100,25 +6128,36 @@ msgid "Enter password:"
 msgstr "Salasana:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Läsnä: %s; %d pelaajaa paikalla."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Kuiskaat pelaajalle %s: %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "Liiku"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6281,12 +6320,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6492,7 +6531,7 @@ msgid "Update host: %s"
 msgstr ""
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr ""
 
@@ -6652,22 +6691,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Lakkaa odottamasta"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Seuraava"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Lähetä"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Nollaa"
 
@@ -6835,7 +6874,7 @@ msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "Oma kauppa"
 
@@ -6867,40 +6906,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Kaupantekoehdotus"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6935,13 +6974,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7262,7 +7301,7 @@ msgid "Completed"
 msgstr "Valmis"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "Kuka on linjoila - päivitän"
 
@@ -7277,12 +7316,12 @@ msgid "Who Is Online - "
 msgstr "Kuka on linjoilla - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "Kuka on linjoilla - virhe"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "Kuka on linjoilla - päivitä"
 
@@ -7304,25 +7343,25 @@ msgstr "Valitse pelimaailma"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7330,7 +7369,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -7411,91 +7450,97 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Kohteen kilta:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr "Muut näppäimet"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "Poimi"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "Muuta poiminnan tyyppiä"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "Istu"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "Kuvankaappaus"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "Salli/estä kaupankäynti"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "Vaihda karttanäkymää"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "Valitse OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr ""
 
@@ -9070,103 +9115,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Et ole vielä riittävän korkealla tasolla!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Voimapisteesi eivät riitä!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Manapisteesi eivät riitä!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Sinulla ei ole muistioita (memo)!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Et voi tehdä tätä juuri nyt!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Näyttää siltä että tarvitset lisää rahaa... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Et voi käyttää tätä taitoa tuollaisen aseen kanssa!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Tarvitset toisen punaisen helmen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Tarvitset toisen sinisen helmen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Kannat liian paljon tehdäksesi tällaista!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10388,56 +10433,56 @@ msgstr ""
 "\"true\", \"false\", \"1\" tai \"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d viikkoa"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d päivää"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d tuntia"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d minuuttia"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d sekuntia"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 06e530a57..644556b3c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -18,14 +18,15 @@
 # mortis tmw <mortistmw@gmail.com>, 2015
 # reid <reidyaro@gmail.com>, 2011-2012
 # reid <reidyaro@gmail.com>, 2011, 2012
+# Scall, 2016
 # Steel Style <steelstyle@free.fr>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-30 15:18+0300\n"
-"PO-Revision-Date: 2016-01-30 09:31+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
+"PO-Revision-Date: 2016-02-01 19:20+0000\n"
+"Last-Translator: Scall\n"
 "Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
 "fr/)\n"
 "Language: fr\n"
@@ -35,7 +36,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr "Fichier mis en ligne"
 
@@ -48,15 +49,15 @@ msgstr "Fichier mis en ligne"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -76,46 +77,58 @@ msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr "Cache nettoyé"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Heure de lancement du client : %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "Images des ressources :"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr "Variables d'environnement effacées"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr "Config ajouté dans :"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr "Config serveur ajouté dans :"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr "Historique ajouté dans :"
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+#, fuzzy
+msgid "You not saw this nick."
+msgstr "Vous n'avez rien pu voler..."
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "Message privé envoyé à %s : %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -287,7 +300,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "Visible sur la carte"
 
@@ -306,12 +319,12 @@ msgid "miss"
 msgstr "raté"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "I"
 
@@ -322,53 +335,53 @@ msgid "You were killed by %s."
 msgstr "Tu as été tué par %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un objet qui n'existe pas."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "L'inventaire est plein."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "La pile est trop grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr "Tu ne peux pas ramasser cette quantité d'objets."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr "Ta pile de cet objet est pleine."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "Problème inconnu pour ramasser l'objet."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -377,53 +390,53 @@ msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "job"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr "PV"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr "Mana"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr "Suivre : %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imiter : %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr "Tu vois %s"
@@ -433,8 +446,8 @@ msgstr "Tu vois %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
@@ -476,7 +489,7 @@ msgstr "Performance"
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Vidéo"
 
@@ -523,7 +536,7 @@ msgstr "Aide"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fermer"
@@ -759,7 +772,6 @@ msgstr "  -O --no-opengl      : Désactiver OpenGL pour cette session"
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
@@ -782,6 +794,12 @@ msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 "Erreur : %s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -799,37 +817,37 @@ msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "Général"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Débogage"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Capture d'écran sauvegardée sous %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "La  capture d'écran a échoué !"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 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:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Erreur Réseau"
 
@@ -1237,7 +1255,7 @@ msgstr "Message"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr "Ressusciter"
 
@@ -1425,8 +1443,8 @@ msgstr "Énorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(défaut)"
 
@@ -1758,14 +1776,14 @@ msgstr "Créer un groupe"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1820,7 +1838,7 @@ msgstr "Échange"
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
-msgstr "Attaquer"
+msgstr "Attaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
@@ -1905,11 +1923,11 @@ msgstr "Parler"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Acheter"
 
@@ -1923,10 +1941,10 @@ msgstr "Acheter"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Vendre"
@@ -1936,7 +1954,7 @@ msgstr "Vendre"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Ajouter commentaire"
 
@@ -1962,7 +1980,7 @@ msgstr "Ajouter à la liste d'attaque"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Ajouter à la liste d'ignorés"
 
@@ -2046,8 +2064,8 @@ msgstr "Joueurs"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Éjecter du groupe"
 
@@ -2060,7 +2078,7 @@ msgstr "Ramasser"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
@@ -2075,8 +2093,8 @@ msgstr "Objet de carte"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Enlever"
 
@@ -2084,7 +2102,7 @@ msgstr "Enlever"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr "Téléportation"
 
@@ -2126,7 +2144,7 @@ msgstr "Éditer le sortilège"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Effacer"
 
@@ -2179,8 +2197,8 @@ msgstr "Quitter"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Copier vers le presse-papier"
 
@@ -2266,9 +2284,9 @@ msgstr "Ajouter tout dans l'échange"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Entreposer"
 
@@ -2341,9 +2359,9 @@ msgstr "Reprendre tout"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2351,46 +2369,46 @@ msgid "Use"
 msgstr "Utiliser"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Vider la fenêtre de dépôt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Cacher"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Montrer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr "Ouvrir la fenêtre de réglages de la barre jaune"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "Remise à zéro des valeurs de la barre jaune"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Aller vers le haut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Aller vers le bas"
 
@@ -2398,30 +2416,30 @@ msgstr "Aller vers le bas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Déshabiller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Copier"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Coller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Ouvrir lien"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Afficher la fenêtre"
 
@@ -2429,7 +2447,7 @@ msgstr "Afficher la fenêtre"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2438,135 +2456,135 @@ msgstr "Niveau : %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Éviter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Liste noire"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Définir comme ennemi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Éliminer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Être ami"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Ne plus ignorer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Suivre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr "Imiter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Acheter (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Vendre (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Inviter dans le groupe"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr "Rejoindre la conversation %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Montrer les objets"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Retirer de la liste de ramassage"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Ajouter à la liste de ramassage"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Objet non protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Objet protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "Déposer..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Déposer tout"
 
@@ -2574,67 +2592,67 @@ msgstr "Déposer tout"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "Déposer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "MJ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "Commandes de MJ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Vérifier ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Aller à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Rappeler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Virer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr "Mettre en silence %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr "Redonner la parole à %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2701,7 +2719,7 @@ msgstr "Conversation"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2988,19 +3006,19 @@ msgstr "Niveau : %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Argent : %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr "Eq."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr "Ouvrir l'adresse"
 
@@ -3011,7 +3029,7 @@ msgstr "Ouvrir l'adresse"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -3027,7 +3045,7 @@ msgstr "Ajouter"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Quitter"
 
@@ -3039,7 +3057,7 @@ msgstr "Quitter"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3051,7 +3069,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -4025,30 +4043,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "Activer le mode attaque"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "Temps"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "Utiliser l’horaire local"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr "Mots en surbrillance (séparés par une virgule)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4057,12 +4081,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr "Ignorer de multiples noms (séparés par une virgule)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4071,12 +4095,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr "Afficher le bouton des émoticônes dans la conversation"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4087,12 +4111,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr "Afficher le message du serveur motd au démarrage"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4562,7 +4586,7 @@ msgstr "Activer le mode boutique"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "PNJ"
 
@@ -4949,22 +4973,27 @@ msgstr "Cacher les noms des joueurs supprimés"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
+msgid "Collect players id and seen log"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid "Use special diagonal speed in players moving"
 msgstr ""
 "Utiliser une vitesse spéciale pour les déplacements diagonaux des joueurs"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:128
+#: src/gui/widgets/tabs/setup_players.cpp:132
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:132
+#: src/gui/widgets/tabs/setup_players.cpp:136
 msgid "Create screenshots for each complete trades"
 msgstr "Créer un imprimé écran pour chaque échange réussi"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:136
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5104,8 +5133,8 @@ msgstr "Thème changé"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Redémarres le jeu pour que les changements soient appliqués."
 
@@ -5186,61 +5215,61 @@ msgid "Button %u action"
 msgstr "Bouton d'action %u"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "Plein écran"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "Limite FPS :"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Limite FPS alternative: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr "Détecter le meilleur mode"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr "Afficher curseur"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Curseur personnalisé"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr "Activer le redimensionnement"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr "Pas d'image"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "Aucun"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5248,7 +5277,7 @@ msgstr ""
 "également pas accessible !"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5256,45 +5285,45 @@ msgstr ""
 "également pas accessible !"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "Passage en plein écran"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr ""
 "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "Activation d'OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Résolution personnalisée (exemple : 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "Entre la nouvelle résolution:        "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "Résolution de l'écran modifiée"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Certaines fenêtres pourraient être modifiées pour coïncider à la résolution "
@@ -6154,25 +6183,36 @@ msgid "Enter password:"
 msgstr "Entre le mot de passe :"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Présents : %s ; %d joueurs sont présents."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Message privé envoyé à %s : %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "Déplacement"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr "%s du familier"
@@ -6335,12 +6375,12 @@ msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6546,7 +6586,7 @@ msgid "Update host: %s"
 msgstr "Hôte de mise à jour : %s"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr "Ouvrir l'URL d'inscription"
 
@@ -6706,22 +6746,22 @@ msgid "Job level: %d"
 msgstr "Niveau de métier : %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Arrêter d'attendre"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Suivant"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Soumettre"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Réinitialiser"
 
@@ -6889,7 +6929,7 @@ msgid "Reset Windows"
 msgstr "Rétablir les fenêtres"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "Boutique Personnelle"
 
@@ -6921,40 +6961,40 @@ msgid "Unpublish"
 msgstr "Supprimer"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Demande d'échange"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Magasin personnel - %s"
@@ -6989,13 +7029,13 @@ msgid "Failed skill: %s"
 msgstr "Compétence ratée : %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7322,7 +7362,7 @@ msgid "Completed"
 msgstr "Terminé"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -7337,12 +7377,12 @@ msgid "Who Is Online - "
 msgstr "Qui est en ligne - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "Qui est en ligne - Erreur"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "Qui est en ligne - Mise à jour"
 
@@ -7364,25 +7404,25 @@ msgstr "Choix du monde"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "touche_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr "JBoutton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr "touche inconnue"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7390,7 +7430,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "touche u"
 
@@ -7471,91 +7511,97 @@ msgstr "Cibler le mercenaire"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Niveau de la cible :"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr "Change le mode de visée"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr "Cibler le familier"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr "Attraper familier"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr "Autres touches"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "Ramasser"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "Changer le type de ramassage"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "S'asseoir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "Capture d'écran"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "Activer / Désactiver les échanges"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr "Ouvrir la fenêtre d'échanges"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr "Commencer l'échange avec la cible"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr "Suivre le joueur sélectionné"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "Changer le mode de vision de carte"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "Sélectionner OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr "S'arrêter et s’asseoir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr "Revenir au mode vidéo sécurisé"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr "Virer ton homoncule"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr "Ouvrir le menu contextuel"
 
@@ -9135,103 +9181,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Erreur de compétence inconnue : %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr "Erreur de compétence inconnue : %d."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Vous n'avez pas encore atteint un niveau suffisant !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Pas assez de vie !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP insuffisants !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Vous n'avez pas d'aide-mémoire !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Vous ne pouvez pas faire ça maintenant !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Il semblerait que vous ayez besoin de plus d'argent... ;)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Vous ne pouvez pas utiliser ce pouvoir avec ce type d'arme !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Vous avez besoin d'une autre pierre précieuse rouge !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Vous avez besoin d'une autre pierre précieuse bleue !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Vous portez trop de choses pour pouvoir faire ça !"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10464,56 +10510,56 @@ msgstr ""
 "Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d semaines"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr "%d semaines"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d jours"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr "%d jours"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d heures"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr "%d heures"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d minutes"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutes"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d secondes"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondes"
diff --git a/po/id.po b/po/id.po
index b99484c3a..523a11f8c 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: 2016-01-30 15:18+0300\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
 "PO-Revision-Date: 2016-01-30 09:31+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
@@ -25,7 +25,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr "Data telah terunggah"
 
@@ -38,15 +38,15 @@ msgstr "Data telah terunggah"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -66,46 +66,57 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr "Cache dibersihkan"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klien hidup: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "Sumber gambar:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "Sumber gambar tak diketahui:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr "Variabel sekitar dibuang"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr "Mengunggah setelan ke:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr "Mengunggah setelan server ke:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr "Mengunggah catatan ke:"
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+msgid "You not saw this nick."
+msgstr ""
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "Berbisik ke %s: %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -275,7 +286,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "Terlihat di peta"
 
@@ -294,12 +305,12 @@ msgid "miss"
 msgstr "luput"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "I"
 
@@ -310,53 +321,53 @@ msgid "You were killed by %s."
 msgstr "Kamu dibunuh oleh %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak ada."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "Barang terlalu berat."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "Barang terlalu jauh."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "Penyimpanan sudah penuh."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "Tumpukan terlalu besar."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "Barang masih milik orang lain."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr "Kamu tidak bisa mengambil barang dalam jumlah ini."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr "Jumlah tumpukan barangmu sudah maksimal."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "Masalah mengambil barang yang tidak diketahui."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -364,53 +375,53 @@ msgstr[0] "Kamu mengambil %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "pekerjaan"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr "Ikuti: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr "Tiruan: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr "Kamu lihat %s"
@@ -420,8 +431,8 @@ msgstr "Kamu lihat %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Sepenuhnya tolak"
 
@@ -463,7 +474,7 @@ msgstr "Performa"
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Vidio"
 
@@ -510,7 +521,7 @@ msgstr "Bantuan"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Tutup"
@@ -739,7 +750,6 @@ msgstr ""
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
@@ -761,6 +771,12 @@ msgstr "Gagal membuat direktori update!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Kesalahan %s tidak ada dan tidak dapat dibuat! Keluar."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -778,36 +794,36 @@ msgstr "pewarnacmd sumberpewarnastring datadst"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "Umum"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Tangkapan layar disimpan sebagai %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Gagal menyimpan tangkapan layar!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Koneksi ke server hilang."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Kesalahan jaringan"
 
@@ -1215,7 +1231,7 @@ msgstr "Pesan"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr "Hidupkan"
 
@@ -1400,8 +1416,8 @@ msgstr "Super besar (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(dasar)"
 
@@ -1733,14 +1749,14 @@ msgstr "Buat kelompok"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1880,11 +1896,11 @@ msgstr "Berbicara"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Beli"
 
@@ -1898,10 +1914,10 @@ msgstr "Beli"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Jual"
@@ -1911,7 +1927,7 @@ msgstr "Jual"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Tambah komentar"
 
@@ -1937,7 +1953,7 @@ msgstr "Tambah ke daftar serangan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Tambah ke daftar abaikan"
 
@@ -2021,8 +2037,8 @@ msgstr "Pemain"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Keluarkan dari kelompok"
 
@@ -2035,7 +2051,7 @@ msgstr "Ambil"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Tambah ke obrolan"
 
@@ -2050,8 +2066,8 @@ msgstr "Item Peta"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Hapus"
 
@@ -2059,7 +2075,7 @@ msgstr "Hapus"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr "Jebakan"
 
@@ -2101,7 +2117,7 @@ msgstr "Edit mantra"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Hapus"
 
@@ -2154,8 +2170,8 @@ msgstr "Meninggalkan"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Salin ke papan"
 
@@ -2241,9 +2257,9 @@ msgstr "Tambah semua ke dagangan"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Simpan"
 
@@ -2316,9 +2332,9 @@ msgstr "Ambil semua"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2326,46 +2342,46 @@ msgid "Use"
 msgstr "Gunakan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Bersihkan jendela buang"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Sembunyi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Tampil"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "Atur ulang bar kuning"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Salin ke obrolan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Bergerak keatas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Bergerak kebawah"
 
@@ -2373,30 +2389,30 @@ msgstr "Bergerak kebawah"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Tanggalkan baju"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Salin"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Tempel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Buka tautan"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Tampil jendela"
 
@@ -2404,7 +2420,7 @@ msgstr "Tampil jendela"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2413,135 +2429,135 @@ msgstr "Tingkatan: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Abaikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Abaikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Daftar hitam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Set sebagai musuh"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Berteman"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Batal pengabaian"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Ikuti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Beli(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Jual(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Undang ke kelompok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr "Gabung obrolan %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Perlihatkan Item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Hapus dari daftar pungut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Tambah ke daftar pungut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Batal proteksi item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Proteksi item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "Buang..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Buang semua"
 
@@ -2549,67 +2565,67 @@ msgstr "Buang semua"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "Buang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "Komando GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Cek ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Pergi ke"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Panggil balik"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Keluarkan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2676,7 +2692,7 @@ msgstr "Obrolan"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2963,19 +2979,19 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Uang: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr "Eq."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr "Buka url"
 
@@ -2986,7 +3002,7 @@ msgstr "Buka url"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -3002,7 +3018,7 @@ msgstr "Tambah"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Keluar"
 
@@ -3014,7 +3030,7 @@ msgstr "Keluar"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3026,7 +3042,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3998,30 +4014,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "Perbolehkan Penyaring Serangan"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "Waktu"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "Gunakan waktu lokal"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr "Sorot kata (dipisan dengan koma)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4030,12 +4052,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr "Nama abaikan global (dipisah dengan koma)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4044,12 +4066,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr "Tampil tombol emosi di obrolan"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4060,12 +4082,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr "Tampil pesan modifikasi server di awal"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4533,7 +4555,7 @@ msgstr "Perbolehkan mode Jual"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4912,21 +4934,26 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
-msgid "Use special diagonal speed in players moving"
+msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:128
-msgid "Log players actions (for GM)"
+msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:132
-msgid "Create screenshots for each complete trades"
+msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:136
+msgid "Create screenshots for each complete trades"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5064,8 +5091,8 @@ msgstr "Tema diganti"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Restart client anda untuk memberikan efek."
 
@@ -5146,109 +5173,109 @@ msgid "Button %u action"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "Layar penuh"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "Batas FPS:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "batas Alt FPS: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Modifikasi kursor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "Tidak ada"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "Mengubah ke mode Layar penuh"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "Mengubah ke OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Modifikasi resolusi (contoh: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "Masukkan resolusi baru:              "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "Resolusi layar diubah"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -6101,25 +6128,36 @@ msgid "Enter password:"
 msgstr "Masukkan sandi:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Kehadiran: %s; %d pemain yang hadir."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Berbisik ke %s: %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "Jalan"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6282,12 +6320,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6491,7 +6529,7 @@ msgid "Update host: %s"
 msgstr ""
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr ""
 
@@ -6651,22 +6689,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Berikutnya"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Masukan"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Reset"
 
@@ -6834,7 +6872,7 @@ msgid "Reset Windows"
 msgstr "Atur ulang jendela"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "Toko personal"
 
@@ -6866,40 +6904,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Meminta untuk menukar"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6934,13 +6972,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7261,7 +7299,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -7276,12 +7314,12 @@ msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -7303,25 +7341,25 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7329,7 +7367,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -7410,91 +7448,97 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Level target:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr ""
 
@@ -9066,103 +9110,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Anda tidak dapat melakukannya sekarang!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Tidak dapat menggunakan skill tersebut dengan senjata tersebut!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10382,56 +10426,56 @@ msgstr ""
 "Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d pekan"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr "%d pekan"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d hari"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr "%d hari"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d jam"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr "%d jam"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d menit"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr "%d menit"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d detik"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr "%d detik"
diff --git a/po/it.po b/po/it.po
index 9fd4cfcd1..51de0c852 100644
--- a/po/it.po
+++ b/po/it.po
@@ -12,15 +12,16 @@
 # Francesco Miglietta <miglietta.francesco@gmail.com>, 2012
 # reid <reidyaro@gmail.com>, 2011
 # reid <reidyaro@gmail.com>, 2011
+# Scall, 2016
 # WildX <gwx480@gmail.com>, 2011
 # WildX <gwx480@gmail.com>, 2011-2012
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-30 15:18+0300\n"
-"PO-Revision-Date: 2016-01-30 09:31+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
+"PO-Revision-Date: 2016-02-01 21:50+0000\n"
+"Last-Translator: Scall\n"
 "Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
 "it/)\n"
 "Language: it\n"
@@ -30,7 +31,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr "File caricato"
 
@@ -43,15 +44,15 @@ msgstr "File caricato"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -71,46 +72,58 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr "Cache puliti"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Tempo online: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "Risorsa immagine:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "Risorsa immagine orfana:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr "Variabile d'ambiente dumping"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr "Carica configurazione in:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr "Carica configurazione server in:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr "Carica log in:"
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+#, fuzzy
+msgid "You not saw this nick."
+msgstr "Non riesci a rubare niente..."
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "Sussurra a %s: %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -280,7 +293,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "Visibile nella mappa"
 
@@ -299,12 +312,12 @@ msgid "miss"
 msgstr "Mancato"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "I"
 
@@ -315,53 +328,53 @@ msgid "You were killed by %s."
 msgstr "Sei stato ucciso da %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "Forza raccolta oggetti non-esistenti."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "L'oggetto è troppo pesante."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "L'oggetto è troppo lontano."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "L'inventario è pieno."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "Troppi oggetti impilati."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "L'oggetto è riservato ad un altro giocatore."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "Raccolta oggetto fallita. Errore sconosciuto."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -370,53 +383,53 @@ msgstr[1] "Hai raccolto %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "EXP"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "Job"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
-msgstr ""
+msgstr "Segui: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "Modalità Segui cancellata"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
-msgstr ""
+msgstr "Imita: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "Modalità Imitazione cancellata"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -426,8 +439,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Ignora completamente."
 
@@ -469,7 +482,7 @@ msgstr ""
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Video"
 
@@ -516,7 +529,7 @@ msgstr "Aiuto"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Chiudi"
@@ -748,7 +761,6 @@ msgstr ""
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s non esiste e non può essere creato! Uscita in corso."
@@ -770,6 +782,12 @@ msgstr "Errore durante la creazione della directory degli aggiornamenti!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s non esiste e non può essere creato! Uscita in corso."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -787,36 +805,36 @@ msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "Generale"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
-msgstr ""
+msgstr "Screenshot salvato come %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio immagine fallito!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "La connessione al server è caduta."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Errore di rete"
 
@@ -1224,7 +1242,7 @@ msgstr "Messaggio"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr ""
 
@@ -1411,8 +1429,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(default)"
 
@@ -1705,13 +1723,13 @@ msgstr "Commento: %s"
 #: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
-msgstr ""
+msgstr "Effetti: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:348
 #, c-format
 msgid "Chat room: %s"
-msgstr ""
+msgstr "Stanza di chat: %s"
 
 #. TRANSLATORS: party popup item
 #. TRANSLATORS: party creation message
@@ -1744,14 +1762,14 @@ msgstr "Crea gruppo"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1891,11 +1909,11 @@ msgstr "Parla"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Compra"
 
@@ -1909,10 +1927,10 @@ msgstr "Compra"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Vendi"
@@ -1922,7 +1940,7 @@ msgstr "Vendi"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Aggiungi commento"
 
@@ -1948,7 +1966,7 @@ msgstr "Aggiungi alla lista Attacco"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Aggiungi alla lista Ignora"
 
@@ -2032,8 +2050,8 @@ msgstr "Giocatori"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Caccia dal party"
 
@@ -2046,7 +2064,7 @@ msgstr "Raccogli"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
@@ -2061,8 +2079,8 @@ msgstr "Oggetto mappa"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -2070,7 +2088,7 @@ msgstr "Rimuovi"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr "Teletrasporto"
 
@@ -2112,7 +2130,7 @@ msgstr "Modifica Incantesimo"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Cancella"
 
@@ -2165,8 +2183,8 @@ msgstr "Lascia"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Copia negli appunti"
 
@@ -2252,9 +2270,9 @@ msgstr "Aggiungi tutti"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Magazzino"
 
@@ -2327,9 +2345,9 @@ msgstr "Ritira tutto"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2337,46 +2355,46 @@ msgid "Use"
 msgstr "Usa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Nascondi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Mostra"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "Reset barra gialla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Copia in Chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Muovi Su"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Muovi Giù"
 
@@ -2384,30 +2402,30 @@ msgstr "Muovi Giù"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Spogliati"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Copia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Incolla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Apri link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Mostra Finestra"
 
@@ -2415,7 +2433,7 @@ msgstr "Mostra Finestra"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2424,135 +2442,135 @@ msgstr "Livello: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
-msgstr ""
+msgstr "Livello massimo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Lista nera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Identifica come nemico"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Elimina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Chiedi amicizia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Stop Ignora"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Segui"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Compra (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Vendi (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Invita nel party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Mostra Oggetti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Rimuovi dalla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Aggiungi alla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "Lascia..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Lascia tutto"
 
@@ -2560,67 +2578,67 @@ msgstr "Lascia tutto"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "Lascia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Caccia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2629,12 +2647,12 @@ msgstr ""
 #: src/gui/popups/skillpopup.cpp:118
 #, c-format
 msgid "Level: %d / %d"
-msgstr ""
+msgstr "Livello: %d / %d"
 
 #. TRANSLATORS: skill level for tmw fake skills
 #: src/gui/popups/skillpopup.cpp:134
 msgid "Level: Unknown"
-msgstr ""
+msgstr "Livello: Sconosciuto"
 
 #. TRANSLATORS: input tab sub tab name
 #: src/gui/setupinputpages.cpp:44
@@ -2687,7 +2705,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2968,25 +2986,25 @@ msgstr ""
 #: src/gui/widgets/characterdisplay.cpp:136
 #, c-format
 msgid "Level: %u"
-msgstr ""
+msgstr "Livello: %u"
 
 #. TRANSLATORS: character money
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Soldi: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr "Apri url"
 
@@ -2997,7 +3015,7 @@ msgstr "Apri url"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -3013,7 +3031,7 @@ msgstr "Aggiungi"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Esci"
 
@@ -3025,7 +3043,7 @@ msgstr "Esci"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3037,7 +3055,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3160,13 +3178,13 @@ msgstr "%s sussurra: %s"
 #: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
-msgstr ""
+msgstr "%s si è connesso."
 
 #. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
-msgstr ""
+msgstr "%s si è disconnesso."
 
 #. TRANSLATORS: guild chat tab name
 #. TRANSLATORS: tab in social window
@@ -4009,30 +4027,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "Attiva filtro attacchi"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "Tempo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "Usa ora locale"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4041,12 +4065,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4055,12 +4079,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4071,12 +4095,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4546,7 +4570,7 @@ msgstr "Abilita la modalità negozio"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4925,21 +4949,26 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
-msgid "Use special diagonal speed in players moving"
+msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:128
-msgid "Log players actions (for GM)"
+msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:132
-msgid "Create screenshots for each complete trades"
+msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:136
+msgid "Create screenshots for each complete trades"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5077,8 +5106,8 @@ msgstr "Tema cambiato"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Per applicare le modifiche, è necessario riavviare il client."
 
@@ -5159,61 +5188,61 @@ msgid "Button %u action"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "Schermo intero"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Limite Alt FPS: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr "Trova modalita' migliore"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr "Mostra cursore"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Cursore personalizzato"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr "Permetti ridimensiona"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "Nessuno"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5221,7 +5250,7 @@ msgstr ""
 "precedente è fallito!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5229,43 +5258,43 @@ msgstr ""
 "modalità precedente è fallito!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "Cambiamento a schermo intero"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "Passa a OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "Riavvia per passare a OpenGL."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Risoluzione scelta (esempio 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "Nuova risoluzione:                   "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "RIsoluzione schermo cambiata"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Alcune finestre potrebbero essere spostate per addattarsi alla risoluzione "
@@ -6037,7 +6066,7 @@ msgstr "Sei sicuro di voler cancellare questo personaggio?"
 #: src/gui/windows/charselectdialog.cpp:60
 #, c-format
 msgid "Account %s (last login time %s)"
-msgstr ""
+msgstr "Account %s (ultima data di accesso %s)"
 
 #. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/charselectdialog.cpp:69
@@ -6071,7 +6100,7 @@ msgstr "Informazioni"
 #: src/gui/windows/charselectdialog.cpp:143
 #, c-format
 msgid "Account %s"
-msgstr ""
+msgstr "Account %s"
 
 #. TRANSLATORS: pin code dialog header.
 #: src/gui/windows/charselectdialog.cpp:173
@@ -6093,6 +6122,11 @@ msgid ""
 "Experience: %u\n"
 "Money: %s"
 msgstr ""
+"Hp: %u%u\n"
+"Mp: %u%u\n"
+"Livello: %u\n"
+"Esperienza: %u\n"
+"Soldi: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:306
@@ -6120,25 +6154,36 @@ msgid "Enter password:"
 msgstr "Digitare password:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presente: %s; %d giocatori sono presenti."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Sussurra a %s: %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "Movimento"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6301,12 +6346,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6509,10 +6554,10 @@ msgstr "Server:"
 #: src/gui/windows/logindialog.cpp:111
 #, c-format
 msgid "Update host: %s"
-msgstr ""
+msgstr "Host per l'aggiornamento: %s"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr "Apri URL di registrazione"
 
@@ -6672,22 +6717,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Ferma attesa"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Prossimo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Invia"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Reimposta"
 
@@ -6700,7 +6745,7 @@ msgstr ""
 #: src/gui/windows/npcselldialog.cpp:75
 #, c-format
 msgid "Do you really want to sell %s?"
-msgstr ""
+msgstr "Desideri veramente vendere %s?"
 
 #. TRANSLATORS: outfits window label
 #: src/gui/windows/outfitwindow.cpp:69 src/gui/windows/outfitwindow.cpp:623
@@ -6855,7 +6900,7 @@ msgid "Reset Windows"
 msgstr "Resetta finestre"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "Negozio personale"
 
@@ -6887,40 +6932,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Richiesta di commercio"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6955,13 +7000,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7284,7 +7329,7 @@ msgid "Completed"
 msgstr "Completato"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "Chi è online - Aggiornamento in corso"
 
@@ -7299,12 +7344,12 @@ msgid "Who Is Online - "
 msgstr "Chi è online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "Chi è online - errore"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "Chi è online - aggiornamento"
 
@@ -7326,25 +7371,25 @@ msgstr "Scegli parola"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr "pulsante sconosciuto"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7352,7 +7397,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -7433,91 +7478,97 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Livello target:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "Raccogli"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "Cambia modo di raccogliere"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "Siediti"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "Screenshot"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "Abilita/Disabilita Scambi"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "Cambia visualiz. mappa"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "Seleziona OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr "Fermati o siediti"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr "Ritorna alla modalità video sicura"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr ""
 
@@ -8748,12 +8799,12 @@ msgstr ""
 #. TRANSLATORS: error message
 #: src/net/eathena/chatrecv.cpp:144
 msgid "Can't equip. Wrong level."
-msgstr ""
+msgstr "Non è possibile l'equipaggiamento. Livello non sufficiente."
 
 #. TRANSLATORS: error message
 #: src/net/eathena/chatrecv.cpp:148
 msgid "Can't use. Wrong level."
-msgstr ""
+msgstr "Non è possibile l'uso. Livello non sufficiente."
 
 #. TRANSLATORS: error message
 #: src/net/eathena/chatrecv.cpp:152
@@ -8776,37 +8827,37 @@ msgstr ""
 #: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
-msgstr ""
+msgstr "Forza %s"
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
-msgstr ""
+msgstr "Agilità %s"
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
-msgstr ""
+msgstr "Vitalità %s"
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
-msgstr ""
+msgstr "Intelligenza %s"
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
-msgstr ""
+msgstr "Destrezza %s"
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
-msgstr ""
+msgstr "Fortuna %s"
 
 #. TRANSLATORS: error message
 #: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
@@ -8846,17 +8897,17 @@ msgstr "Fortuna"
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:243 src/net/tmwa/generalhandler.cpp:253
 msgid "Defense"
-msgstr "Difesa."
+msgstr "Difesa"
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
-msgstr "Attacco magico."
+msgstr "Attacco M."
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
 msgid "M.Defense"
-msgstr "Difesa Magica."
+msgstr "Difesa M."
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:250 src/net/tmwa/generalhandler.cpp:260
@@ -9090,106 +9141,106 @@ msgstr ""
 #: src/net/eathena/petrecv.cpp:72
 #, c-format
 msgid "hungry level %d"
-msgstr ""
+msgstr "livello di fame %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Non hai raggiunto un Livello sufficientemente alto!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP insufficienti!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP Insufficienti!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Non hai nessun promemoria!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Al momento non puoi farlo!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Sembra tu abbia bisogno di più soldi... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Non puoi usare questa Abilità con questa arma!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Hai bisogno un'altra Gemma Rossa!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Hai bisogno un'altra Gemma Blu!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Stai trasportando troppo carico per compiere quest'azione!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -9342,7 +9393,7 @@ msgstr "senza nome"
 #: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
-msgstr ""
+msgstr "Attacco %s"
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:101
@@ -9366,13 +9417,13 @@ msgstr ""
 #: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
-msgstr ""
+msgstr "Attacco M. %s"
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
-msgstr ""
+msgstr "Difesa %s"
 
 #. TRANSLATORS: item info label (min defence)
 #: src/resources/db/itemdb.cpp:111
@@ -9396,7 +9447,7 @@ msgstr ""
 #: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
-msgstr ""
+msgstr "Difesa M. %s"
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:119
@@ -9438,13 +9489,13 @@ msgstr ""
 #: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
-msgstr ""
+msgstr "Livello %s"
 
 #. TRANSLATORS: item info label (moving speed)
 #: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
-msgstr ""
+msgstr "Agilità %s"
 
 #. TRANSLATORS: item info label (attack range)
 #: src/resources/db/itemdb.cpp:135
@@ -9632,7 +9683,7 @@ msgstr "L'oggetto non può essere equipaggiato."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:142
 msgid "Unable to equip because you have wrong level."
-msgstr ""
+msgstr "Impossibile equipaggiare a causa del proprio livello."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:146
@@ -9893,7 +9944,7 @@ msgstr ""
 #: src/resources/notifications.h:366
 #, c-format
 msgid "%s blocked invite!"
-msgstr ""
+msgstr "%s ha bloccato l'invito!"
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:370
@@ -10099,19 +10150,19 @@ msgstr ""
 #: src/resources/notifications.h:528
 #, c-format
 msgid "%s joined room."
-msgstr ""
+msgstr "%s è entrato nella stanza."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:532
 #, c-format
 msgid "%s left room."
-msgstr ""
+msgstr "%s è uscito dalla stanza."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:536
 #, c-format
 msgid "%s kicked from room."
-msgstr ""
+msgstr "%s è stato buttato fuori dalla stanza."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:540
@@ -10375,13 +10426,13 @@ msgstr ""
 #: src/resources/notifications.h:776
 #, c-format
 msgid "Player %s died."
-msgstr ""
+msgstr "Il giocatore %s è morto."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:780
 #, c-format
 msgid "Player %s logged out."
-msgstr ""
+msgstr "Il giocatore %s si è disconnesso."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:784
@@ -10410,56 +10461,56 @@ msgstr ""
 "\" (falso), \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d settimane"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr "%d settimane"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d giorni"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr "%d giorni"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d ore"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr "%d ore"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d minuti"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuti"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d secondi"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondi"
diff --git a/po/ja.po b/po/ja.po
index 6fea09fa1..111989f9b 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: 2016-01-30 15:18+0300\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
 "PO-Revision-Date: 2016-01-30 09:31+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
@@ -26,7 +26,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr ""
 
@@ -39,15 +39,15 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -67,46 +67,58 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "クライアントの稼働時間: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "リソースイメージ:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "リソース孤児イメージ:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr ""
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+#, fuzzy
+msgid "You not saw this nick."
+msgstr "何も盗めませんでした..."
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "%sにささやき中:%s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -275,7 +287,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "マップに表示させる"
 
@@ -294,12 +306,12 @@ msgid "miss"
 msgstr "ミス"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "I"
 
@@ -310,53 +322,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "存在しないアイテムは拾えません."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "アイテムが重過ぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "アイテムが遠すぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "インベントリーが満杯です."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "量が多すぎます."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "これは他のプレイヤーのアイテムです."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "不明なエラーの為拾えません."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -364,53 +376,53 @@ msgstr[0] "%d [@@%d|%s@@]を手に入れました."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "ジョブ"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "フォローを止める"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "真似をやめる"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -420,8 +432,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "完全無視"
 
@@ -463,7 +475,7 @@ msgstr ""
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "ビデオ"
 
@@ -510,7 +522,7 @@ msgstr "ヘルプ"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "閉じる"
@@ -742,7 +754,6 @@ msgstr ""
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%sは存在しない為、作成できません."
@@ -764,6 +775,12 @@ msgstr "更新フォルダの作成エラ!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "エラー: %s は存在しない為、作成できません."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%sは存在しない為、作成できません."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -781,36 +798,36 @@ msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "デバッグ"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "スクリーンショットを保存できませんでした!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "サーバーへの接続が切断されました."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "ネットワークエラー"
 
@@ -1218,7 +1235,7 @@ msgstr "メッセージ"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr ""
 
@@ -1402,8 +1419,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(デフォルト)"
 
@@ -1735,14 +1752,14 @@ msgstr "パーティを作る"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1882,11 +1899,11 @@ msgstr "話す"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "買う"
 
@@ -1900,10 +1917,10 @@ msgstr "買う"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "売る"
@@ -1913,7 +1930,7 @@ msgstr "売る"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "コメントをする"
 
@@ -1939,7 +1956,7 @@ msgstr "攻撃リストへ追加する"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "攻撃無視リストへ追加する"
 
@@ -2023,8 +2040,8 @@ msgstr "プレイヤー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "パーティから一時的に追い出す"
 
@@ -2037,7 +2054,7 @@ msgstr "拾う"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "チャットに追加"
 
@@ -2052,8 +2069,8 @@ msgstr "マップアイテム"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "削除"
 
@@ -2061,7 +2078,7 @@ msgstr "削除"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr "ワープ"
 
@@ -2103,7 +2120,7 @@ msgstr "呪文を編集する"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "クリア"
 
@@ -2156,8 +2173,8 @@ msgstr "退会"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "クリップボードにコピー"
 
@@ -2243,9 +2260,9 @@ msgstr "トレードウィンドウに全て追加する"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "保管"
 
@@ -2318,9 +2335,9 @@ msgstr "全部取出す"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2328,46 +2345,46 @@ msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "ドロップ窓を消す"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "非表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "黄色バーをリセットする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "チャットへコピーする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "上へ移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "下へ移動"
 
@@ -2375,30 +2392,30 @@ msgstr "下へ移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "脱ぐ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "コピー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "ペースト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2406,7 +2423,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2415,135 +2432,135 @@ msgstr "レベル: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "無視する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "ブラックリスト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "敵に設定する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "消す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "友達になる"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "完全無視解除"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "フォロー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "買う (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "売る (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "パーティへ招待"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "アイテムを表示する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "落とす..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "全て落とす"
 
@@ -2551,67 +2568,67 @@ msgstr "全て落とす"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "落とす"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2678,7 +2695,7 @@ msgstr "チャット"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2965,19 +2982,19 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "GP: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr "装着."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr "URLを開く"
 
@@ -2988,7 +3005,7 @@ msgstr "URLを開く"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -3004,7 +3021,7 @@ msgstr "追加"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "終了"
 
@@ -3016,7 +3033,7 @@ msgstr "終了"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3028,7 +3045,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -4000,30 +4017,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "攻撃フィルターを有効にする"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "時間"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "ローカルタイムを使う"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr "文字をハイライト (コンマで区切る)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4032,12 +4055,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4046,12 +4069,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4062,12 +4085,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4537,7 +4560,7 @@ msgstr "ショップモードを有効にする"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4916,21 +4939,26 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
-msgid "Use special diagonal speed in players moving"
+msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:128
-msgid "Log players actions (for GM)"
+msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:132
-msgid "Create screenshots for each complete trades"
+msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:136
+msgid "Create screenshots for each complete trades"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5068,8 +5096,8 @@ msgstr "テーマを変更しました"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "設定変更の為アプリケーションを再起動してください."
 
@@ -5150,109 +5178,109 @@ msgid "Button %u action"
 msgstr "ボタン %u アクション"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "フルスクリーン"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "FPSリミット:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Alt FPS リミット: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr "カーソルを表示"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "カスタムカーソル"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr "リサイズを有効にする"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr "フレームなし"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "なし"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "ウインドウモード、また前モードの復元にも失敗しました!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "フルスクリーンモード、また前モードの復元にも失敗しました!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "フルスクリーンに変更"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "設定変更の為、再起動をしてください."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "OpenGLに変更"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGLの設定を変更するため、再起動をしてください."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "カスタム解像度 (例: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "解像度を入力して下さい:              "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "スクリーンの解像度を変更しました"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "解像度の変更に合わせ、いくつかのウィンドウが移動する可能性があります."
 
@@ -6105,25 +6133,36 @@ msgid "Enter password:"
 msgstr "パスワードを入力して下さい:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "現在: %s; %d プレイヤーがいます."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%sにささやき中:%s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "動く"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6286,12 +6325,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6495,7 +6534,7 @@ msgid "Update host: %s"
 msgstr "アップデートホスト: %s"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr ""
 
@@ -6655,22 +6694,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "キャンセル"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "次"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "決定"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "リセット"
 
@@ -6838,7 +6877,7 @@ msgid "Reset Windows"
 msgstr "ウィンドウをリセットする"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "最大 (15)"
 
@@ -6870,40 +6909,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "トレードをリクエスト"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6938,13 +6977,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7267,7 +7306,7 @@ msgid "Completed"
 msgstr "完了"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "オンラインリスト - アップデート中"
 
@@ -7282,12 +7321,12 @@ msgid "Who Is Online - "
 msgstr "オンラインリスト - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "オンラインリスト - エラー"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "オンラインリスト - アップデート"
 
@@ -7309,25 +7348,25 @@ msgstr "世界の選択"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "キー_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr "ジョイスティックボタン%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr "不明なキー"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7335,7 +7374,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u キー"
 
@@ -7416,91 +7455,97 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "ターゲットレベル:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr "その他のキー"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "拾う"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "拾い方を変更"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "座る"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "スクリーンショット"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "取引を有効/無効にする"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "マップビューモード変更"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "OKを選択する"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr "止まる・座る"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr "セーフビデオモードへ戻る"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr ""
 
@@ -9076,103 +9121,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "あなたはまだ十分なlvlに達していません!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "メモがありません!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "今この行動はできません!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "GPが足りません... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "このスキルはこの武器と一緒に使えません!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Red Gemが必要です!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Blue Gemが必要です!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "アイテムを持ちすぎています!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10393,56 +10438,56 @@ msgstr ""
 "\"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d週"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d日"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d時"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d分"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d秒"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr ""
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 71129394b..e50f1aac4 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: 2016-01-30 15:18+0300\n"
+"POT-Creation-Date: 2016-02-10 19:21+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:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr ""
 
@@ -32,15 +32,15 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -60,46 +60,57 @@ msgstr ""
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr ""
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+msgid "You not saw this nick."
+msgstr ""
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, c-format
+msgid "Last seen for %s: %s"
+msgstr ""
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -268,7 +279,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr ""
 
@@ -287,12 +298,12 @@ msgid "miss"
 msgstr ""
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr ""
 
@@ -303,53 +314,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -358,53 +369,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -414,8 +425,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr ""
 
@@ -457,7 +468,7 @@ msgstr ""
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr ""
 
@@ -504,7 +515,7 @@ msgstr ""
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
@@ -733,7 +744,6 @@ msgstr ""
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -755,6 +765,12 @@ msgstr ""
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr ""
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -772,36 +788,36 @@ msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr ""
 
@@ -1209,7 +1225,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr ""
 
@@ -1393,8 +1409,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1726,14 +1742,14 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1873,11 +1889,11 @@ msgstr ""
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr ""
 
@@ -1891,10 +1907,10 @@ msgstr ""
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr ""
@@ -1904,7 +1920,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr ""
 
@@ -1930,7 +1946,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr ""
 
@@ -2014,8 +2030,8 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr ""
 
@@ -2028,7 +2044,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr ""
 
@@ -2043,8 +2059,8 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr ""
 
@@ -2052,7 +2068,7 @@ msgstr ""
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr ""
 
@@ -2094,7 +2110,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr ""
 
@@ -2147,8 +2163,8 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2234,9 +2250,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr ""
 
@@ -2309,9 +2325,9 @@ msgstr ""
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2319,46 +2335,46 @@ msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr ""
 
@@ -2366,30 +2382,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2397,7 +2413,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2406,135 +2422,135 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr ""
 
@@ -2542,67 +2558,67 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2669,7 +2685,7 @@ msgstr ""
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2956,19 +2972,19 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr ""
 
@@ -2979,7 +2995,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -2995,7 +3011,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr ""
 
@@ -3007,7 +3023,7 @@ msgstr ""
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr ""
@@ -3019,7 +3035,7 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr ""
 
@@ -3991,30 +4007,35 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+msgid "Enable trade spam filter"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4023,12 +4044,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4037,12 +4058,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4053,12 +4074,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4526,7 +4547,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr ""
 
@@ -4905,21 +4926,26 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
-msgid "Use special diagonal speed in players moving"
+msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:128
-msgid "Log players actions (for GM)"
+msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:132
-msgid "Create screenshots for each complete trades"
+msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:136
+msgid "Create screenshots for each complete trades"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5057,8 +5083,8 @@ msgstr ""
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -5139,109 +5165,109 @@ msgid "Button %u action"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr ""
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr ""
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -6094,25 +6120,35 @@ msgid "Enter password:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+msgid "Moved: "
+msgstr ""
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6275,12 +6311,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6486,7 +6522,7 @@ msgid "Update host: %s"
 msgstr ""
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr ""
 
@@ -6646,22 +6682,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr ""
 
@@ -6829,7 +6865,7 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr ""
 
@@ -6861,40 +6897,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6929,13 +6965,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7256,7 +7292,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -7271,12 +7307,12 @@ msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -7298,25 +7334,25 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7324,7 +7360,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -7405,91 +7441,96 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
-msgid "Change targeting type"
+msgid "Target skill unit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:142
-msgid "Target pet"
+msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:148
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:154
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:160
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:166
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:172
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:178
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:184
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:190
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:196
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:202
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:208
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:214
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr ""
 
@@ -9061,103 +9102,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10376,56 +10417,56 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 8f5ef45c1..fa1e46728 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: 2016-01-30 15:18+0300\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
 "PO-Revision-Date: 2016-01-30 09:31+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr "Bestand is opgeladen"
 
@@ -36,15 +36,15 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -64,46 +64,58 @@ msgstr "Oké"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr "Cache gewist"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "Bron afbeeldingen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "Bron verweesde afbeeldingen:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr "Omgevingsvariabelen gedumpt"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr "Configuratie opgeladen in:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr "Log opgeladen in:"
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+#, fuzzy
+msgid "You not saw this nick."
+msgstr "Kon niets stelen..."
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "Fluisteren naar %s: %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -272,7 +284,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
@@ -291,12 +303,12 @@ msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "I"
 
@@ -307,53 +319,53 @@ msgid "You were killed by %s."
 msgstr "U bent gedood door %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "Inventaris is vol."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "Uw opstapeling is de groot."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr "U kan deze hoeveelheid aan items niet oprapen."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr "U zit aan het maximum van uw opslagruimte."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "Onbekend probleem bij het oprapen van voorwerp."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -362,53 +374,53 @@ msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "ep"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "job"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr "Volg %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imiteer %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr "You see %s"
@@ -418,8 +430,8 @@ msgstr "You see %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -461,7 +473,7 @@ msgstr "Performantie"
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Video"
 
@@ -508,7 +520,7 @@ msgstr "Help"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sluiten"
@@ -737,7 +749,6 @@ msgstr ""
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
@@ -759,6 +770,12 @@ msgstr "Fout bij het creëren van de update map!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -776,36 +793,36 @@ msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Schermafdruk opgeslagen als %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Netwerkfout"
 
@@ -1213,7 +1230,7 @@ msgstr "Bericht"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr ""
 
@@ -1399,8 +1416,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1732,14 +1749,14 @@ msgstr "Groep aanmaken"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1879,11 +1896,11 @@ msgstr "Spreken"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Kopen"
 
@@ -1897,10 +1914,10 @@ msgstr "Kopen"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Verkopen"
@@ -1910,7 +1927,7 @@ msgstr "Verkopen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr ""
 
@@ -1936,7 +1953,7 @@ msgstr "Aan de aanvalslijst toevoegen"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
@@ -2020,8 +2037,8 @@ msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
@@ -2034,7 +2051,7 @@ msgstr "Raap op"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
@@ -2049,8 +2066,8 @@ msgstr "Plaats voorwerp op de kaart"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Verwijder"
 
@@ -2058,7 +2075,7 @@ msgstr "Verwijder"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr ""
 
@@ -2100,7 +2117,7 @@ msgstr "Wijzig spreuk"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Wissen"
 
@@ -2153,8 +2170,8 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2240,9 +2257,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Opslaan"
 
@@ -2315,9 +2332,9 @@ msgstr "Haal alles op"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2325,46 +2342,46 @@ msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2372,30 +2389,30 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2403,7 +2420,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2412,135 +2429,135 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Geen rekening mee houden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Negeer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
@@ -2548,67 +2565,67 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Ga naar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Schop"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2675,7 +2692,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2962,19 +2979,19 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr ""
 
@@ -2985,7 +3002,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -3001,7 +3018,7 @@ msgstr "Toevoegen"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -3013,7 +3030,7 @@ msgstr "Afsluiten"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3025,7 +3042,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3997,30 +4014,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "Zet handle tab aan"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "Tijd"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "Gebruik lokale tijd"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4029,12 +4052,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4043,12 +4066,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4059,12 +4082,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4532,7 +4555,7 @@ msgstr "shop modus aanzetten"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4911,21 +4934,26 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
-msgid "Use special diagonal speed in players moving"
+msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:128
-msgid "Log players actions (for GM)"
+msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:132
-msgid "Create screenshots for each complete trades"
+msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:136
+msgid "Create screenshots for each complete trades"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5063,8 +5091,8 @@ msgstr "Thema is gewijzigd"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
@@ -5145,61 +5173,61 @@ msgid "Button %u action"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "Volledig scherm"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "FPS limiet:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Alt FPS limiet: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "Geen"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5207,7 +5235,7 @@ msgstr ""
 "faalde ook!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5215,43 +5243,43 @@ msgstr ""
 "modus faalde ook!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "Verwisselen naar Volledig Scherm"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "Verwisselen naar OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Manuele resolutie (voorbeeld: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "Geef een nieuwe resolutie:           "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "Scherm Resolutie is gewijzigd"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
@@ -6106,25 +6134,36 @@ msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Aanwezig: %s; %d speler zijn aanwezig."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "Beweeg"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6287,12 +6326,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6498,7 +6537,7 @@ msgid "Update host: %s"
 msgstr ""
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr ""
 
@@ -6658,22 +6697,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Volgende"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Indienen"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Reset"
 
@@ -6841,7 +6880,7 @@ msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "Persoonlijke winkel"
 
@@ -6873,40 +6912,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6941,13 +6980,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7270,7 +7309,7 @@ msgid "Completed"
 msgstr "Voltooid"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "Wie Is Online - Bijwerken"
 
@@ -7285,12 +7324,12 @@ msgid "Who Is Online - "
 msgstr "Wie Is Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "Wie Is Online - fout"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "Wie Is Online - Bijgewerkt"
 
@@ -7312,25 +7351,25 @@ msgstr "Kies Wereld"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7338,7 +7377,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u key"
 
@@ -7419,91 +7458,97 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Doel Gilde:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "Oprapen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "Verander Opraap Type"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "Zitten"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "Handelen inschakelen/uitschakelen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "Wijzig Map Tonen Modus"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "OK selecteren"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr "Stop of zit"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr ""
 
@@ -9079,103 +9124,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Je hebt nog geen hoog genoeg level bereikt!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Onvoldoende leven!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Onvoldoende Vaardigheidspunten!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Je hebt geen memo's!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Je kan dat nu niet doen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Je hebt een andere rode edelsteen nodig!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Je hebt een andere blauwe edelsteen nodig!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Je draagt teveel bij je om dit te doen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10396,56 +10441,56 @@ msgstr ""
 "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d weken"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr "%d weken"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d dagen"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr "%d dagen"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d uren"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr "%d uren"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d minuten"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuten"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d seconden"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 8f5ef45c1..fa1e46728 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: 2016-01-30 15:18+0300\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
 "PO-Revision-Date: 2016-01-30 09:31+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
@@ -23,7 +23,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr "Bestand is opgeladen"
 
@@ -36,15 +36,15 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -64,46 +64,58 @@ msgstr "Oké"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr "Cache gewist"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client uptime: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "Bron afbeeldingen:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "Bron verweesde afbeeldingen:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr "Omgevingsvariabelen gedumpt"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr "Configuratie opgeladen in:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr "Log opgeladen in:"
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+#, fuzzy
+msgid "You not saw this nick."
+msgstr "Kon niets stelen..."
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "Fluisteren naar %s: %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -272,7 +284,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "Zichtbaar op de map"
 
@@ -291,12 +303,12 @@ msgid "miss"
 msgstr "mist"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "I"
 
@@ -307,53 +319,53 @@ msgid "You were killed by %s."
 msgstr "U bent gedood door %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "Inventaris is vol."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "Uw opstapeling is de groot."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr "U kan deze hoeveelheid aan items niet oprapen."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr "U zit aan het maximum van uw opslagruimte."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "Onbekend probleem bij het oprapen van voorwerp."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -362,53 +374,53 @@ msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "ep"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "job"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr "Volg %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imiteer %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr "You see %s"
@@ -418,8 +430,8 @@ msgstr "You see %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -461,7 +473,7 @@ msgstr "Performantie"
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Video"
 
@@ -508,7 +520,7 @@ msgstr "Help"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sluiten"
@@ -737,7 +749,6 @@ msgstr ""
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
@@ -759,6 +770,12 @@ msgstr "Fout bij het creëren van de update map!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -776,36 +793,36 @@ msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "Algemeen"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Schermafdruk opgeslagen als %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Opslaan van screenshot mislukt!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "De verbinding met de server is verbroken."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Netwerkfout"
 
@@ -1213,7 +1230,7 @@ msgstr "Bericht"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr ""
 
@@ -1399,8 +1416,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1732,14 +1749,14 @@ msgstr "Groep aanmaken"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1879,11 +1896,11 @@ msgstr "Spreken"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Kopen"
 
@@ -1897,10 +1914,10 @@ msgstr "Kopen"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Verkopen"
@@ -1910,7 +1927,7 @@ msgstr "Verkopen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr ""
 
@@ -1936,7 +1953,7 @@ msgstr "Aan de aanvalslijst toevoegen"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
@@ -2020,8 +2037,8 @@ msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
@@ -2034,7 +2051,7 @@ msgstr "Raap op"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
@@ -2049,8 +2066,8 @@ msgstr "Plaats voorwerp op de kaart"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Verwijder"
 
@@ -2058,7 +2075,7 @@ msgstr "Verwijder"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr ""
 
@@ -2100,7 +2117,7 @@ msgstr "Wijzig spreuk"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Wissen"
 
@@ -2153,8 +2170,8 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2240,9 +2257,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Opslaan"
 
@@ -2315,9 +2332,9 @@ msgstr "Haal alles op"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2325,46 +2342,46 @@ msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2372,30 +2389,30 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2403,7 +2420,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2412,135 +2429,135 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Geen rekening mee houden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Negeer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
@@ -2548,67 +2565,67 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Ga naar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Schop"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2675,7 +2692,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2962,19 +2979,19 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Geld: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr ""
 
@@ -2985,7 +3002,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -3001,7 +3018,7 @@ msgstr "Toevoegen"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Afsluiten"
 
@@ -3013,7 +3030,7 @@ msgstr "Afsluiten"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3025,7 +3042,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3997,30 +4014,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "Zet handle tab aan"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "Tijd"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "Gebruik lokale tijd"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4029,12 +4052,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4043,12 +4066,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4059,12 +4082,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4532,7 +4555,7 @@ msgstr "shop modus aanzetten"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4911,21 +4934,26 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
-msgid "Use special diagonal speed in players moving"
+msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:128
-msgid "Log players actions (for GM)"
+msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:132
-msgid "Create screenshots for each complete trades"
+msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:136
+msgid "Create screenshots for each complete trades"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5063,8 +5091,8 @@ msgstr "Thema is gewijzigd"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Herstart de client om de wijzigingen in werking te doen treden."
 
@@ -5145,61 +5173,61 @@ msgid "Button %u action"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "Volledig scherm"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "FPS limiet:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Alt FPS limiet: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Aangepaste cursor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "Geen"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5207,7 +5235,7 @@ msgstr ""
 "faalde ook!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5215,43 +5243,43 @@ msgstr ""
 "modus faalde ook!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "Verwisselen naar Volledig Scherm"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "De veranderingen worden pas actief na opnieuw opstarten."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "Verwisselen naar OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Manuele resolutie (voorbeeld: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "Geef een nieuwe resolutie:           "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "Scherm Resolutie is gewijzigd"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
@@ -6106,25 +6134,36 @@ msgid "Enter password:"
 msgstr "Geef wachtwoord:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Aanwezig: %s; %d speler zijn aanwezig."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Fluisteren naar %s: %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "Beweeg"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6287,12 +6326,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6498,7 +6537,7 @@ msgid "Update host: %s"
 msgstr ""
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr ""
 
@@ -6658,22 +6697,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Volgende"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Indienen"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Reset"
 
@@ -6841,7 +6880,7 @@ msgid "Reset Windows"
 msgstr "Vensters in beginstand"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "Persoonlijke winkel"
 
@@ -6873,40 +6912,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Handel aanvragen"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6941,13 +6980,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7270,7 +7309,7 @@ msgid "Completed"
 msgstr "Voltooid"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "Wie Is Online - Bijwerken"
 
@@ -7285,12 +7324,12 @@ msgid "Who Is Online - "
 msgstr "Wie Is Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "Wie Is Online - fout"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "Wie Is Online - Bijgewerkt"
 
@@ -7312,25 +7351,25 @@ msgstr "Kies Wereld"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7338,7 +7377,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u key"
 
@@ -7419,91 +7458,97 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Doel Gilde:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "Oprapen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "Verander Opraap Type"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "Zitten"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "Schermafdruk"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "Handelen inschakelen/uitschakelen"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "Wijzig Map Tonen Modus"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "OK selecteren"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr "Stop of zit"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr ""
 
@@ -9079,103 +9124,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Je hebt nog geen hoog genoeg level bereikt!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Onvoldoende leven!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Onvoldoende Vaardigheidspunten!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Je hebt geen memo's!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Je kan dat nu niet doen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Je hebt een andere rode edelsteen nodig!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Je hebt een andere blauwe edelsteen nodig!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Je draagt teveel bij je om dit te doen!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10396,56 +10441,56 @@ msgstr ""
 "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d weken"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr "%d weken"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d dagen"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr "%d dagen"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d uren"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr "%d uren"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d minuten"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuten"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d seconden"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
diff --git a/po/pl.po b/po/pl.po
index 0e693562b..16028fbd5 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: 2016-01-30 15:18+0300\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
 "PO-Revision-Date: 2016-01-30 09:31+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
@@ -27,7 +27,7 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr "Plik wysłano"
 
@@ -40,15 +40,15 @@ msgstr "Plik wysłano"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -68,46 +68,58 @@ msgstr "Ok"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr "Cache opróżnione"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Czas pracy programu: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "Obrazy źródłowe:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "Osierocone obrazy źródłowe:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr "Zmienne środowiskowe zostały zrzucone"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr "Załaduj ustawienia do:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr "Załaduj ustawienia serwera do:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr "Załaduj log do:"
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+#, fuzzy
+msgid "You not saw this nick."
+msgstr "Nie udało się niczego ukraść..."
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "Szepczesz do %s: %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -276,7 +288,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "Widoczne na mapie"
 
@@ -295,12 +307,12 @@ msgid "miss"
 msgstr "Pudło!"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "I"
 
@@ -311,53 +323,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "Próbowano podnieść nieistniejący przedmiot."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "Przedmiot zbyt ciężki."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "Przedmiot za daleko."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "Inwentarz jest pełny."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "Za duży stos."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "Przedmiot należy do kogoś innego."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "Nieznany problem podczas próby podniesienia przedmiotu."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -367,53 +379,53 @@ msgstr[2] "Podniosłeś/aś %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "skill"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr "Podążanie: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "Podążanie anulowane."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitowanie: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "Imitacja anulowana"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr "Widzisz %s"
@@ -423,8 +435,8 @@ msgstr "Widzisz %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Całkowicie ignoruj"
 
@@ -466,7 +478,7 @@ msgstr "Wydajność"
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Ekran"
 
@@ -513,7 +525,7 @@ msgstr "Pomoc"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zamknij"
@@ -742,7 +754,6 @@ msgstr "  -O --no-opengl      : deaktywuj OpenGL na tę sesję"
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s nie istnieje i nie może byś utworzone! Wyjście."
@@ -764,6 +775,12 @@ msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Błąd: %s nie istnieje i nie może być utworzone! Wyjście."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s nie istnieje i nie może byś utworzone! Wyjście."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -781,36 +798,36 @@ msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "Ogólny"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Zrzut ekranu zapisany jako %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Zapisywanie zrzutu ekranu nie powiodło się!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Połączenie z serwerem zostało zerwane."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Błąd sieci"
 
@@ -1218,7 +1235,7 @@ msgstr "Wiadomość"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr "Wskrześ"
 
@@ -1405,8 +1422,8 @@ msgstr "Ogromna (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(domyślne)"
 
@@ -1738,14 +1755,14 @@ msgstr "Utwórz grupę"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1885,11 +1902,11 @@ msgstr "Rozmowa"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Kup"
 
@@ -1903,10 +1920,10 @@ msgstr "Kup"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Sprzedaj"
@@ -1916,7 +1933,7 @@ msgstr "Sprzedaj"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Dodaj komentarz"
 
@@ -1942,7 +1959,7 @@ msgstr "Dodaj do listy atakowanych"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Dodaj do listy ignorowanych"
 
@@ -2026,8 +2043,8 @@ msgstr "Gracze"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Wyrzuć z grupy"
 
@@ -2040,7 +2057,7 @@ msgstr "Podnieś"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Dodaj do czatu"
 
@@ -2055,8 +2072,8 @@ msgstr "Portal"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Usuń"
 
@@ -2064,7 +2081,7 @@ msgstr "Usuń"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr "Teleport"
 
@@ -2106,7 +2123,7 @@ msgstr "Edytuj zaklęcie"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Wyczyść"
 
@@ -2159,8 +2176,8 @@ msgstr "Opuść"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Skopiuj do schowka"
 
@@ -2246,9 +2263,9 @@ msgstr "Dodaj wszystko do handlu"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Podaj"
 
@@ -2321,9 +2338,9 @@ msgstr "Pobierz wszystko"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2331,46 +2348,46 @@ msgid "Use"
 msgstr "Użyj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Wyczyść okno upuszczeń."
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Ukryj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Pokaż"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "Zresetuj żółty pasek"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Skopiuj do czatu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "W górę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "W dół"
 
@@ -2378,30 +2395,30 @@ msgstr "W dół"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Rozbierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Kopiuj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Wklej"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Otwórz adres internetowy"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Pokaż okno"
 
@@ -2409,7 +2426,7 @@ msgstr "Pokaż okno"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2418,135 +2435,135 @@ msgstr "Poziom: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Lekceważ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignoruj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Czarna lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Ustaw jako wroga"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Usuń"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Dodaj do znajomych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Odignoruj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Podążaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Kup (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Sprzedaj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Zaproś do grupy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Pokaż przedmioty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Usuń z listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Dodaj do listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Przestań chronić przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Chroń przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "Upuść..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Upuść wszystko"
 
@@ -2554,67 +2571,67 @@ msgstr "Upuść wszystko"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "Upuść"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "Polecenia GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Sprawdź IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Idź do"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Przywołaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Wyrzuć"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2681,7 +2698,7 @@ msgstr "Czat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2968,19 +2985,19 @@ msgstr "Poziom: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Pieniądze: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr "Ekw."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr "Otwórz adres url"
 
@@ -2991,7 +3008,7 @@ msgstr "Otwórz adres url"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -3007,7 +3024,7 @@ msgstr "Dodaj"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Wyjdź"
 
@@ -3019,7 +3036,7 @@ msgstr "Wyjdź"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3031,7 +3048,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -4005,30 +4022,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "Filtruj ataki"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "Czas"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "Użyj lokalnego czasu"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr "Podświetlaj słowa (oddzielaj przecinkiem)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4037,12 +4060,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr "Ignoruj imienia globalnie (oddzielone przecinkiem)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4051,12 +4074,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr "Pokazuj przycisk emotek w czacie"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4067,12 +4090,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr "Pokazuj motd serwera podczas startu"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4542,7 +4565,7 @@ msgstr "Włącz tryb sklepu"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4921,21 +4944,26 @@ msgstr "Ukryj nicki usuniętych graczy"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
+msgid "Collect players id and seen log"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid "Use special diagonal speed in players moving"
 msgstr "Użyj specjalnej diagonalnej prędkości do poruszania się."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:128
+#: src/gui/widgets/tabs/setup_players.cpp:132
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:132
+#: src/gui/widgets/tabs/setup_players.cpp:136
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:136
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5075,8 +5103,8 @@ msgstr "Skórka zmieniona"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Uruchom ponownie program, aby mogły zajść zmiany."
 
@@ -5157,68 +5185,68 @@ msgid "Button %u action"
 msgstr "Działanie przycisku %u"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "Pełny ekran"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "Limit FPS:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Alternatywny limit FPS: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr "Wykryj najlepszy tryb"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr "Pokaż kursor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Własny kursor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr "Włącz zmianę rozmiaru"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr "Bez ramki"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "Brak"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Nie udało się zmienić na tryb w oknie, ani przywrócić do poprzedniego stanu!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5226,43 +5254,43 @@ msgstr ""
 "stanu!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "Zmiana na tryb pełnoekranowy"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "Wymagane ponowne uruchomienie aby zastosować zmiany."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "Zmiana na OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "Zastosowanie zmiany na OpenGL wymaga ponownego uruchomienia."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Własna rozdzielczość (np. 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "Wpisz nową rozdzielczość:            "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "Rozdzielczość zmieniona"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Niektóre okna mogą być przesunięte aby dopasować się do niższej "
@@ -6122,25 +6150,36 @@ msgid "Enter password:"
 msgstr "Wprowadź hasło:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "%s obecny/a. %d graczy online."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Szepczesz do %s: %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "Podejdź"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr "zwierzątko gracza %s's"
@@ -6303,12 +6342,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6516,7 +6555,7 @@ msgid "Update host: %s"
 msgstr "Host aktualizacji: %s"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr "Otwórz stronę z rejestracją"
 
@@ -6676,22 +6715,22 @@ msgid "Job level: %d"
 msgstr "Poziom Pracy: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Przerwij"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Dalej"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Zatwierdź"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Resetuj"
 
@@ -6859,7 +6898,7 @@ msgid "Reset Windows"
 msgstr "Zresetuj okna"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "Własny sklep"
 
@@ -6891,40 +6930,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Prośba o handel"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6959,13 +6998,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7288,7 +7327,7 @@ msgid "Completed"
 msgstr "Zakończono"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "Kto jest online- aktualizacja"
 
@@ -7303,12 +7342,12 @@ msgid "Who Is Online - "
 msgstr "Gracze online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "Gracze online- błąd"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "Gracze online- aktualizacja"
 
@@ -7330,25 +7369,25 @@ msgstr "Wybierz świat"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr "nieznany klawisz"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7356,7 +7395,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "(nieznany)"
 
@@ -7437,91 +7476,97 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Poziom celu:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr "Inne"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "Podnieś"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "Zmień sposób podnoszenia"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "Usiądź"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "Zrzut ekranu"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "Włącz/Wysłącz Handlowanie"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr "Otwórz okno handlu"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "Zmień widok mapy"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "Wybrano OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr "Zatrzymaj się lub usiądź"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr "Powrót do bezpiecznego trybu wyświetlania"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr ""
 
@@ -9095,103 +9140,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Nie masz jeszcze wymaganego poziomu!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Zbyt niskie HP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Zbyt niska mana!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Nie masz notek!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Nie możesz tego teraz zrobić!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Chyba brak Ci kasy... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Nie możesz użyć tej umiejętności przy tym rodzaju broni!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Potrzebujesz innego czerwonego klejnotu!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Potrzebujesz innego niebieskiego klejnotu!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Niesiesz za duży ciężar by to zrobić!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10414,56 +10459,56 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d tygodni/e"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr "%d tygodni/e"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d dni"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr "%d dni"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d godzin/y"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr "%d godzin/y"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d minut/y"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr "%d minut/y"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d sekund/y"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund/y"
diff --git a/po/pt.po b/po/pt.po
index 5224dcc90..ff3fd099d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,13 +7,15 @@
 # freya <freya.df@gmail.com>, 2013
 # freya <freya.df@gmail.com>, 2011-2012
 # freya <freya.df@gmail.com>, 2011,2013
+# Scall, 2016
+# Scall, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-30 15:18+0300\n"
-"PO-Revision-Date: 2016-01-30 09:31+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
+"PO-Revision-Date: 2016-02-01 22:08+0000\n"
+"Last-Translator: Scall\n"
 "Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
 "pt/)\n"
 "Language: pt\n"
@@ -23,7 +25,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr ""
 
@@ -36,15 +38,15 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -64,46 +66,58 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "Recursos de imagens:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr "Variáveis de ambiente despejadas"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr ""
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+#, fuzzy
+msgid "You not saw this nick."
+msgstr "Não foi possível roubar nada..."
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "Enviando MP para %s: %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -272,7 +286,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "Visivel no mapa"
 
@@ -291,12 +305,12 @@ msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "l"
 
@@ -304,56 +318,56 @@ msgstr "l"
 #: src/being/localplayer.cpp:384
 #, c-format
 msgid "You were killed by %s."
-msgstr ""
+msgstr "Foste morto(a) por %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "Item está muito longe."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -362,53 +376,53 @@ msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "exp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "Profissão"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguir: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitando: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr "Você vê %s"
@@ -418,8 +432,8 @@ msgstr "Você vê %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -461,7 +475,7 @@ msgstr ""
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Vídeo"
 
@@ -508,7 +522,7 @@ msgstr "Ajuda"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fechar"
@@ -742,7 +756,6 @@ msgstr "  -O --no-opengl : Desabilita OpenGL nesta sessão"
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
@@ -764,6 +777,12 @@ msgstr "Erro ao criar pasta de atualizações!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s não existe e não pode ser criado! Saindo."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -781,36 +800,36 @@ msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em: %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Erro de conexão"
 
@@ -1218,7 +1237,7 @@ msgstr "Mensagem"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr ""
 
@@ -1406,8 +1425,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1700,7 +1719,7 @@ msgstr "Comentário: %s"
 #: src/gui/popups/beingpopup.cpp:333
 #, c-format
 msgid "Effects: %s"
-msgstr ""
+msgstr "Efeitos: %s"
 
 #. TRANSLATORS: being popup label
 #: src/gui/popups/beingpopup.cpp:348
@@ -1739,14 +1758,14 @@ msgstr "Criar grupo"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1801,7 +1820,7 @@ msgstr "Negócios"
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
-msgstr "Atacar"
+msgstr "Ataque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
@@ -1886,11 +1905,11 @@ msgstr "Falar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1904,10 +1923,10 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Vender"
@@ -1917,7 +1936,7 @@ msgstr "Vender"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
@@ -1943,7 +1962,7 @@ msgstr "Adicionar a lista de ataques"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
@@ -2027,8 +2046,8 @@ msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Chutar do grupo"
 
@@ -2041,7 +2060,7 @@ msgstr "Pegar"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Nome no chat"
 
@@ -2056,8 +2075,8 @@ msgstr "Mapa Item"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "A Remover"
 
@@ -2065,7 +2084,7 @@ msgstr "A Remover"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr "Urdidura"
 
@@ -2107,7 +2126,7 @@ msgstr "Editar Feitiços"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Limpar"
 
@@ -2160,8 +2179,8 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "CopiaCopiar para a área de transferência"
 
@@ -2247,9 +2266,9 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Armazenar"
 
@@ -2322,9 +2341,9 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2332,46 +2351,46 @@ msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "Resetar barra amarela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Copiar para o chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Mover a cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Mover a baixo"
 
@@ -2379,30 +2398,30 @@ msgstr "Mover a baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Abrir link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Mostrar janela"
 
@@ -2410,7 +2429,7 @@ msgstr "Mostrar janela"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2419,135 +2438,135 @@ msgstr "Nível: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Ser inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Definir como inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Ser Amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Mostar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Remover lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Adicionar na lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -2555,67 +2574,67 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Chutar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2682,7 +2701,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2969,19 +2988,19 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr "Eq."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr "Abrir URL"
 
@@ -2992,7 +3011,7 @@ msgstr "Abrir URL"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -3008,7 +3027,7 @@ msgstr "Adicionar"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Sair"
 
@@ -3020,7 +3039,7 @@ msgstr "Sair"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3032,7 +3051,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3079,7 +3098,7 @@ msgstr ""
 #: src/gui/widgets/skillinfo.cpp:115
 #, c-format
 msgid "Type: %s"
-msgstr ""
+msgstr "Tipo: %s"
 
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: unknown equipment page name
@@ -4004,30 +4023,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "A habilitar filtro de ataque"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "Tempo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "Usar hora local"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr "Palavras Destacadas (separadas por vírgulas)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4036,12 +4061,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4050,12 +4075,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4066,12 +4091,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4541,7 +4566,7 @@ msgstr "Habilitar modo loja"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4920,21 +4945,26 @@ msgstr "Ocultar nicks de jogadores apagados"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
-msgid "Use special diagonal speed in players moving"
+msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:128
-msgid "Log players actions (for GM)"
+msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:132
-msgid "Create screenshots for each complete trades"
+msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:136
+msgid "Create screenshots for each complete trades"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5072,8 +5102,8 @@ msgstr "Tema alterado"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -5154,68 +5184,68 @@ msgid "Button %u action"
 msgstr "Ação do botão %u"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "Tela cheia"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "Limite de FPS:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Limite de FPS alternativo: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr "Detectar melhor modo"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr "Mostrar cursor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr "Habilitar redirecionamento de janela"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr "Sem moldura de janela"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "Nenhum"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5223,43 +5253,43 @@ msgstr ""
 "anterior!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução                "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
@@ -6088,9 +6118,9 @@ msgid ""
 msgstr ""
 "Hp: %u/%u\n"
 "Mp: %u/%u\n"
-"Level: %u\n"
+"Nível: %u\n"
 "Experiência: %u\n"
-"Money: %s"
+"Dinheiro: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:306
@@ -6118,25 +6148,36 @@ msgid "Enter password:"
 msgstr "Entre com a senha:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "Mover"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6299,12 +6340,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6510,7 +6551,7 @@ msgid "Update host: %s"
 msgstr "Atualizando Servidores: %s"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr "Abrir URL de cadastro"
 
@@ -6670,22 +6711,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Aguarde..."
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Próximo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Enviar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Resetar"
 
@@ -6853,7 +6894,7 @@ msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "Loja pessoal"
 
@@ -6885,40 +6926,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6953,13 +6994,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7281,7 +7322,7 @@ msgid "Completed"
 msgstr "Concluído"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
@@ -7296,12 +7337,12 @@ msgid "Who Is Online - "
 msgstr "Quem está online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -7323,25 +7364,25 @@ msgstr "Escolher Mundo"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr "JBotão%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr "Tecla desconhecida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7349,7 +7390,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "Tecla u"
 
@@ -7430,91 +7471,97 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Level do alvo:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr "Outras teclas"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "Pegar item"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "Mudar o modo de pegar itens"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "Sentar"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "Screenshot"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Desabilitar Negociações"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "Mudar o modo de visualização de mapas"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "Selecionar OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr "Parar ou sentar"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr "Retornar para modo seguro de vídeo"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr ""
 
@@ -8773,37 +8820,37 @@ msgstr ""
 #: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Strength %s"
-msgstr ""
+msgstr "Força %s"
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Agility %s"
-msgstr ""
+msgstr "Agilidade %s"
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Vitality %s"
-msgstr ""
+msgstr "Vitalidade %s"
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:136
 #, c-format
 msgid "Intelligence %s"
-msgstr ""
+msgstr "Inteligência %s"
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:131 src/net/tmwa/generalhandler.cpp:138
 #, c-format
 msgid "Dexterity %s"
-msgstr ""
+msgstr "Destreza %s"
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:133 src/net/tmwa/generalhandler.cpp:140
 #, c-format
 msgid "Luck %s"
-msgstr ""
+msgstr "Sorte %s"
 
 #. TRANSLATORS: error message
 #: src/net/eathena/generalhandler.cpp:197 src/net/tmwa/generalhandler.cpp:207
@@ -8848,7 +8895,7 @@ msgstr "Defesa"
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:245 src/net/tmwa/generalhandler.cpp:255
 msgid "M.Attack"
-msgstr "Atq. Mágico"
+msgstr "Ataque M."
 
 #. TRANSLATORS: player stat
 #: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:257
@@ -9090,103 +9137,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Você ainda não tem o nivel necessário!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Você não pode fazer isso agora!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que você precisa de mais dinheiro... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Você precisa de outra gema vermelha!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra jóia azul!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Você está com muita carga para fazer isso!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -9339,7 +9386,7 @@ msgstr "sem nome"
 #: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
-msgstr ""
+msgstr "Ataque %s"
 
 #. TRANSLATORS: item info label (min attack)
 #: src/resources/db/itemdb.cpp:101
@@ -9363,7 +9410,7 @@ msgstr ""
 #: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
-msgstr ""
+msgstr "Ataque M. %s"
 
 #. TRANSLATORS: item info label (defence)
 #: src/resources/db/itemdb.cpp:109
@@ -9393,7 +9440,7 @@ msgstr ""
 #: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
-msgstr ""
+msgstr "Defesa M. %s"
 
 #. TRANSLATORS: item info label (min magic defence)
 #: src/resources/db/itemdb.cpp:119
@@ -9435,19 +9482,19 @@ msgstr ""
 #: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
-msgstr ""
+msgstr "Nível %s"
 
 #. TRANSLATORS: item info label (moving speed)
 #: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
-msgstr ""
+msgstr "Agilidade %s"
 
 #. TRANSLATORS: item info label (attack range)
 #: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
-msgstr ""
+msgstr "Alcance %s"
 
 #. TRANSLATORS: item info label (flee)
 #: src/resources/db/itemdb.cpp:137
@@ -10407,56 +10454,56 @@ msgstr ""
 "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d semanas"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr "%d semanas"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d dias"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr "%d dias"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d horas"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr "%d horas"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d minutos"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutos"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d segundos"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ba7e71635..829c15d63 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -17,14 +17,15 @@
 # Luciano Zago <lcnzg7@gmail.com>, 2013,2015
 # María Rolón <luxlloth@gmail.com>, 2012
 # María Rolón <luxlloth@gmail.com>, 2012
+# Scall, 2016
 # Xtreem <guilhermegg11@hotmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-30 15:18+0300\n"
-"PO-Revision-Date: 2016-01-30 09:31+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
+"PO-Revision-Date: 2016-02-01 19:55+0000\n"
+"Last-Translator: Scall\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
 "language/pt_BR/)\n"
 "Language: pt_BR\n"
@@ -34,7 +35,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr "Arquivo enviado"
 
@@ -47,15 +48,15 @@ msgstr "Arquivo enviado"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -75,46 +76,58 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr "Cache limpo"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Uptime do cliente: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "Recursos de imagem:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr "Variáveis de ambiente despejada"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr "A|rquivos de configuração enviados para:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr "Configuração de servidor enviada para:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr "Registro enviado em:"
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+#, fuzzy
+msgid "You not saw this nick."
+msgstr "Não foi possível roubar nada..."
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "Enviando MP para %s: %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -285,7 +298,7 @@ msgid "Quick"
 msgstr "Rápido"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "Mapa visivel"
 
@@ -304,12 +317,12 @@ msgid "miss"
 msgstr "errou"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "I"
 
@@ -320,53 +333,53 @@ msgid "You were killed by %s."
 msgstr "Você foi morto(a) por %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "Item está muito longe."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr "Você não pode pegar essa quantia de itens."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr "Sua pilha de itens possui a quantidade máxima."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -375,53 +388,53 @@ msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "exp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "profissão"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr "hp"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr "mana"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr "Seguindo: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitando: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr "Você vê %s"
@@ -431,8 +444,8 @@ msgstr "Você vê %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -474,7 +487,7 @@ msgstr "Desempenho"
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Vídeo"
 
@@ -521,7 +534,7 @@ msgstr "Ajuda"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fechar"
@@ -754,7 +767,6 @@ msgstr "  -O --no-opengl      : Desabilita OpenGL nesta sessão"
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
@@ -776,6 +788,12 @@ msgstr "Erro ao criar pasta de atualizações!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s não existe e não pode ser criado! Saindo."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -793,36 +811,36 @@ msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "Geral"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Depurador"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Captura de Tela salva em %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Erro de conexão"
 
@@ -1230,7 +1248,7 @@ msgstr "Mensagem"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr "Reviver"
 
@@ -1418,8 +1436,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1751,14 +1769,14 @@ msgstr "Criar grupo"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1813,7 +1831,7 @@ msgstr "Negociação"
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
-msgstr "Atacar"
+msgstr "Ataque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
@@ -1898,11 +1916,11 @@ msgstr "Falar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1916,10 +1934,10 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Vender"
@@ -1929,7 +1947,7 @@ msgstr "Vender"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
@@ -1955,7 +1973,7 @@ msgstr "Adicionar a lista de ataques"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
@@ -2039,8 +2057,8 @@ msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Expulsar do grupo"
 
@@ -2053,7 +2071,7 @@ msgstr "Pegar"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Nome no chat"
 
@@ -2068,8 +2086,8 @@ msgstr "Mapa Item"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Remover"
 
@@ -2077,7 +2095,7 @@ msgstr "Remover"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr "Urdidura"
 
@@ -2119,7 +2137,7 @@ msgstr "Editar feitiços"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Limpar"
 
@@ -2172,8 +2190,8 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Copiar para a área de transferência"
 
@@ -2259,9 +2277,9 @@ msgstr "Adicionar todos na negociação"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Armazenar"
 
@@ -2334,9 +2352,9 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2344,46 +2362,46 @@ msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr "Abrir as configurações da barra amarela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "Zerar barra amarela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Copiar para chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Mover para cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Mover para baixo"
 
@@ -2391,30 +2409,30 @@ msgstr "Mover para baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Despir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Abrir endereço"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Mostrar Janela"
 
@@ -2422,7 +2440,7 @@ msgstr "Mostrar Janela"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2431,135 +2449,135 @@ msgstr "Nível: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr "Level máximo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Ser inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Definir como inimigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Ser amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr "Entrar no chat %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Mostrar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Remover da lista de pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Adicionar a lista de captura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Desproteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Proteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -2567,67 +2585,67 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "Comandos de GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Checar IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Ir à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Trazer jogador"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Chutar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr "Silenciar %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr "Liberar %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2694,7 +2712,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2981,19 +2999,19 @@ msgstr "Nível: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr "Eq."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr "Abrir URL"
 
@@ -3004,7 +3022,7 @@ msgstr "Abrir URL"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -3020,7 +3038,7 @@ msgstr "Adicionar"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Sair"
 
@@ -3032,7 +3050,7 @@ msgstr "Sair"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3044,7 +3062,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -4124,18 +4142,24 @@ msgstr ""
 "Nota: é principalmente uma questão de atitude nervosa vs menos espaço "
 "utilizável para texto."
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "Habilitar filtro de ataque"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "Tempo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "Usar tempo local"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
@@ -4145,12 +4169,12 @@ msgstr ""
 "tempo do servidor será usado (normalmente é o GMT+0)."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr "Palavras destacadas (separadas em vírgulas)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4163,12 +4187,12 @@ msgstr ""
 "Nota: Isto pode ser irritante - use este recurso com sabedoria."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr "Nomes globais à ignorar (separados por virgula)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4183,12 +4207,12 @@ msgstr ""
 "importantes!"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr "Mostrar botão de emoticon no chat"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4205,12 +4229,12 @@ msgstr ""
 "normalmente F1 por padrão."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr "Mostrar mensagem do dia ao começar"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4683,7 +4707,7 @@ msgstr "Habilitar modo loja"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -5064,21 +5088,26 @@ msgstr "Esconder nicks de jogadores apagados"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
+msgid "Collect players id and seen log"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid "Use special diagonal speed in players moving"
 msgstr "Utilizar velocidade diagonal especial em jogadores se movendo"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:128
+#: src/gui/widgets/tabs/setup_players.cpp:132
 msgid "Log players actions (for GM)"
 msgstr "Registro de ações de Jogadores (para GM)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:132
+#: src/gui/widgets/tabs/setup_players.cpp:136
 msgid "Create screenshots for each complete trades"
 msgstr "Tira uma foto da tela a cada negociação completa."
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:136
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5218,8 +5247,8 @@ msgstr "Tema alterado"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o cliente para que as mudanças surtam efeito."
 
@@ -5300,68 +5329,68 @@ msgid "Button %u action"
 msgstr "Ação do botão %u"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "Tela cheia"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "Limite de FPS:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Limite de FPS alternativo: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr "Detectar melhor modo"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr "Mostrar Ponteiro"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr "Habilitar redimensionamento"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr "Sem moldura de janela"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "Nenhum"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5369,43 +5398,43 @@ msgstr ""
 "anterior!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mudanças no OpenGL requerem o reinício do jogo."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Resolução customizada (exemplo 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "Escolha a nova resolução             "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
@@ -6264,25 +6293,36 @@ msgid "Enter password:"
 msgstr "Entre com a senha:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "Mover"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr "Apelido suspeito detectado: "
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr "Animal de estimação de %s"
@@ -6445,12 +6485,12 @@ msgid "E"
 msgstr "E"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr "Insira o cartão requisitado"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "insira %s em %s?"
@@ -6656,7 +6696,7 @@ msgid "Update host: %s"
 msgstr "Atualizando Servidor: %s"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr "Abrir endereço de registro"
 
@@ -6816,22 +6856,22 @@ msgid "Job level: %d"
 msgstr "Nível de profissão: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Parar de esperar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Próximo"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Enviar"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Resetar"
 
@@ -6999,7 +7039,7 @@ msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "Loja pessoal"
 
@@ -7031,40 +7071,40 @@ msgid "Unpublish"
 msgstr "Despublicar"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Loja Pessoal - %s"
@@ -7099,13 +7139,13 @@ msgid "Failed skill: %s"
 msgstr "Habilidade falhou: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Adicione um texto a habilidade %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr "Texto: "
 
@@ -7427,7 +7467,7 @@ msgid "Completed"
 msgstr "Concluído"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "Quem está online - Atualizando"
 
@@ -7442,12 +7482,12 @@ msgid "Who Is Online - "
 msgstr "Quem está online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "Quem está online - Erro"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "Quem está online - Atualizado"
 
@@ -7469,25 +7509,25 @@ msgstr "Escolher Mundo"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr "BotãoJ%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr "Tecla desconhecida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7495,7 +7535,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "tecla u"
 
@@ -7576,91 +7616,97 @@ msgstr "Selecionar mercenário"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Unidade de habilidade"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr "Alterar o tipo de alvo"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr "Selecionar animal de estimação"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr "Pegar animal de estimação"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr "Outras teclas"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "Pegar item"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "Mudar o modo de pegar itens"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "Sentar"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "Screenshot"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Desabilitar Negociações"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr "Abrir janela de negociação"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr "Inicia negociação com o alvo."
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr "Segue o jogador selecionado"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "Mudar o modo de visualização de mapas"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "Selecionar OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr "Parar ou sentar"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr "Retornar para o modo seguro de vídeo"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr "Dispensar seu homúnculo"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr "Abrir menu de contexto"
 
@@ -9237,103 +9283,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Erro desconhecido de habilidade: %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr "Erro desconhecido de habilidade: %d."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Você ainda não tem o nivel necessário!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Você não pode fazer isso agora!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que você precisa de mais dinheiro... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Você precisa de outra gema vermelha!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra jóia azul!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Você está com muita carga para fazer isso!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr "Falha ao sumonar."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr "Precisa de espíritos."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr "Precisa de equipamentos %s."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr "Precisa de equipamentos %s e da quantidade %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr "Precisa do item %s."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr "Precisa do item %s e da quantidade %d"
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr "Selecione o alvo do warp"
 
@@ -10560,56 +10606,56 @@ msgstr ""
 "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d semanas"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr "%d Semanas"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d dias"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr "%d Dias"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d horas"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr "%d Horas"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d minutos"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr "%d Minutos"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d segundos"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr "%d Segundos"
diff --git a/po/ru.po b/po/ru.po
index 7ad32cc03..642e90a51 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,6 +8,7 @@
 # Andrei Karas <akaras@inbox.ru>, 2011-2016
 # Ильшат Сайдуллин <bio_editor@mail.ru>, 2013
 # John Smith <torck777@safe-mail.net>, 2014
+# kaban kabanovich <slaytor@gmail.com>, 2016
 # Ильшат Сайдуллин <bio_editor@mail.ru>, 2013
 # Necromonger <Necromong@inbox.ru>, 2011
 # Necromonger <Necromong@inbox.ru>, 2011
@@ -19,9 +20,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-30 15:18+0300\n"
-"PO-Revision-Date: 2016-01-30 12:13+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
+"PO-Revision-Date: 2016-02-03 14:32+0000\n"
+"Last-Translator: kaban kabanovich <slaytor@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
 "ru/)\n"
 "Language: ru\n"
@@ -33,7 +34,7 @@ msgstr ""
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr "Файл выгружен"
 
@@ -46,15 +47,15 @@ msgstr "Файл выгружен"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -74,46 +75,58 @@ msgstr "ОК"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr "Кеш очищен"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Время работы клиента: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "Изображений:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr "Переменные среды сохранены"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr "Информация о выгруженном конфиге:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr "Информация о выгруженном конфиге сервера:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr "Информация о выгруженном логе:"
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+#, fuzzy
+msgid "You not saw this nick."
+msgstr "Не удалось ничего украсть..."
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "Вы прошептали %s: %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -282,7 +295,7 @@ msgid "Quick"
 msgstr "Быстро"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "Видимые на карте"
 
@@ -301,12 +314,12 @@ msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "О"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "Б"
 
@@ -317,53 +330,53 @@ msgid "You were killed by %s."
 msgstr "Вы были убиты %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr "Вы не можете поднять такое количество."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr "Слишком много предметов в стэке."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -374,53 +387,53 @@ msgstr[3] "Вы подняли %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "опыт"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "работа"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr "здоровье"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr "мана"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr "Следовать за: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr "Имитация: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr "Вы видите %s"
@@ -430,8 +443,8 @@ msgstr "Вы видите %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Полностью игнорировать"
 
@@ -473,7 +486,7 @@ msgstr "Производительность"
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Видео"
 
@@ -520,7 +533,7 @@ msgstr "Помощь"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Закрыть"
@@ -751,7 +764,6 @@ msgstr "  -O --no-opengl      : Не использовать OpenGL для эт
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
@@ -773,6 +785,12 @@ msgstr "Ошибка создания директории для обновле
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s не существует, и не может быть создано! Выход."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -790,36 +808,36 @@ msgstr "dyecmd файл_строка_цвета файл_назначения"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "Общие"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Отладка"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Снимок экрана сохранен как %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Ошибка при сохранении снимка экрана!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Соединение с сервером потеряно."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Ошибка сети"
 
@@ -1227,7 +1245,7 @@ msgstr "Сообщение"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr "Оживить"
 
@@ -1415,8 +1433,8 @@ msgstr "Огромный (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(по умолчанию)"
 
@@ -1748,14 +1766,14 @@ msgstr "Создать группу"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1895,11 +1913,11 @@ msgstr "Разговор"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Купить"
 
@@ -1913,10 +1931,10 @@ msgstr "Купить"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Продать"
@@ -1926,7 +1944,7 @@ msgstr "Продать"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Добавить комментарий"
 
@@ -1952,7 +1970,7 @@ msgstr "Добавить в список атаки"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Добавить в список игнорирования"
 
@@ -2036,8 +2054,8 @@ msgstr "Игроки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Выкинуть из группы"
 
@@ -2050,7 +2068,7 @@ msgstr "Поднять"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
@@ -2065,8 +2083,8 @@ msgstr "Элемент карты"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Удалить"
 
@@ -2074,7 +2092,7 @@ msgstr "Удалить"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr "Прыгнуть"
 
@@ -2116,7 +2134,7 @@ msgstr "Изменить заклинание"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Очистить"
 
@@ -2169,8 +2187,8 @@ msgstr "Покинуть"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Копировать в буфер обмена"
 
@@ -2256,9 +2274,9 @@ msgstr "Добавить к торговле все"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Сохранить"
 
@@ -2331,9 +2349,9 @@ msgstr "Получить все"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2341,46 +2359,46 @@ msgid "Use"
 msgstr "Использовать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Очистить окно дропов"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Спрятать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Показать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr "Открыть настройки желтой панели"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Передвинуть выше"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
@@ -2388,30 +2406,30 @@ msgstr "Передвинуть ниже"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Раздеть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Копировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Вставить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Открыть ссылку"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Показать окно"
 
@@ -2419,7 +2437,7 @@ msgstr "Показать окно"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2428,135 +2446,135 @@ msgstr "Уровень: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr "Макс. уровень"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Пренебречь"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Игнорировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Черный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Сделать врагом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Стереть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Подружиться"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Не игнорировать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Следовать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr "Имитировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Купить (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Продать (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Пригласить в группу"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr "Присоединиться к чату %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Показать предметы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Удалить из поднятия"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Сделать поднимаемым"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Снять защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Поставить защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "Бросить..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Бросить все"
 
@@ -2564,67 +2582,67 @@ msgstr "Бросить все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "Бросить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "Коменды ГМ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Проверить IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Перейти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Вызвать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Кикнуть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr "Приглушить %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr "Убрать пришлушение %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr "Поместить в крафт %d"
@@ -2691,7 +2709,7 @@ msgstr "Чат"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2978,19 +2996,19 @@ msgstr "Уровень: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Деньги: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr "Од."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr "Открыть ссылку"
 
@@ -3001,7 +3019,7 @@ msgstr "Открыть ссылку"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -3017,7 +3035,7 @@ msgstr "Добавить"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Выход"
 
@@ -3029,7 +3047,7 @@ msgstr "Выход"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3041,7 +3059,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3688,6 +3706,8 @@ msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
 msgstr ""
+"Отключает цветные сообщения чата. Если опция включена, все сообщения будут "
+"такого же цвета как и основной текст чата."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:77
@@ -3781,7 +3801,7 @@ msgstr "Вести лог чата отладки"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
-msgstr ""
+msgstr "Если включить, то debug (отладочный) чат будет сохраняться на диск."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:137
@@ -4016,30 +4036,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "Включить фильтр атак"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "Время"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "Использовать местное время"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr "Подсвечиваемые слова (разделенные запятыми)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4048,12 +4074,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr "Игнорировать глобальные сообщения с именами (разделенные запятой)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4062,12 +4088,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr "Показывать кнопку эмоций в чате"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4078,16 +4104,18 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr "Показывать motd сообщение сервера"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
 msgstr ""
+"Если включена эта опция, то при подключении к серверу будет отображаться "
+"MOTD - сообщение/совет дня. Отключите, чтобы не показывать MOTD."
 
 #. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
@@ -4553,7 +4581,7 @@ msgstr "Включить режим магазина"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4939,21 +4967,26 @@ msgstr "Спрятать имена стертых персонажей"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
+msgid "Collect players id and seen log"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid "Use special diagonal speed in players moving"
 msgstr "Использовать специальную диагональную скорость в передвижении игроков"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:128
+#: src/gui/widgets/tabs/setup_players.cpp:132
 msgid "Log players actions (for GM)"
 msgstr "Логировать действия пользователей (для ГМ)"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:132
+#: src/gui/widgets/tabs/setup_players.cpp:136
 msgid "Create screenshots for each complete trades"
 msgstr "Создавать снимок экрана для каждого законченного обмена"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:136
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr "Эмулировать правую кнопку мыши при помощи долгого нажатия левой кнопки"
@@ -5091,8 +5124,8 @@ msgstr "Тема изменена"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Перезагрузите игру дабы изменения вступили в силу."
 
@@ -5173,61 +5206,61 @@ msgid "Button %u action"
 msgstr "Действие кнопки %u"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "На полный экран"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "Ограничить кадр/с:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Альтер. ограничить кадр/с: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr "Найти лучший режим"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr "Показывать курсор"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Игровой курсор"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr "Разрешить менять размер окна"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr "Без рамки"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "Нет"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5235,7 +5268,7 @@ msgstr ""
 "удалось!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5243,43 +5276,43 @@ msgstr ""
 "также не удалось!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "Переключение в полноэкранный режим"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "Переключение на OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "Для изменения режима OpenGL необходима перезагрузки игры."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Свое разрешение (например: 1024х768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "Введите новое разрешение:            "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "Разрешение экрана изменено"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем "
@@ -6139,25 +6172,36 @@ msgid "Enter password:"
 msgstr "Введите пароль:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Присутствуют: %s; Всего %d игроков."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Вы прошептали %s: %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "Движение"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr "Обнаружен некорректный ник: "
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr "животное %s'а"
@@ -6320,12 +6364,12 @@ msgid "E"
 msgstr "С"
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr "Вопрос о вставке карты"
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr "Вставить %s в %s?"
@@ -6535,7 +6579,7 @@ msgid "Update host: %s"
 msgstr "Сервер обновлений: %s"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr "Открыть ссылку регистрации"
 
@@ -6695,22 +6739,22 @@ msgid "Job level: %d"
 msgstr "Уровень профессии: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Остановить ожидание"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Следующий"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Применить"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Сбросить"
 
@@ -6878,7 +6922,7 @@ msgid "Reset Windows"
 msgstr "Сбросить расположение окон"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "Свой магазин"
 
@@ -6910,40 +6954,40 @@ msgid "Unpublish"
 msgstr "Убрать"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr "ошибка: игрок занят"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr "ошибка: нельзя продать предмет"
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr "ошибка: нельзя купить предмет"
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr "%s хочет купить %s. Вы разрешаете?"
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr "%s хочет продать %s. Вы разрешаете?"
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Запрос на Торговлю"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr "Персональный магазин - %s"
@@ -6978,13 +7022,13 @@ msgid "Failed skill: %s"
 msgstr "Неудача навыка: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Добавить текст к скилу %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr "Текст: "
 
@@ -7307,7 +7351,7 @@ msgid "Completed"
 msgstr "Завершено"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "Кто онлайн - обновление"
 
@@ -7322,12 +7366,12 @@ msgid "Who Is Online - "
 msgstr "Кто онлайн - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "Кто онлайн - ошибка"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "Кто онлайн - обновление"
 
@@ -7349,25 +7393,25 @@ msgstr "Выберите сервер"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "кнопка_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr "КнопДж%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr "неизвестная кнопка"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr "ДЖ%d"
@@ -7375,7 +7419,7 @@ msgstr "ДЖ%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "неиз."
 
@@ -7456,91 +7500,97 @@ msgstr "Выделение наемника"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Объект скила"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr "Изменение типа выбора цели"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr "Выбрать питомца"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr "Поймать питомца"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr "Другие клавиши"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "Поднятие предметов"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "Изменение типа подбора предметов"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "Приседание/Вставание"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "Создание скриншота"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "Разрешение/Запрет торговли"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr "Открывает окно обмена"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr "Начать обмен"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr "Следовать за игроком"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "Изменение режима отображения карты"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "Выбор OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr "Остановиться или сесть"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr "Вернуться в безопасный видео режим"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr "Уволить гомункула"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr "Открыть контекстное меню"
 
@@ -9115,103 +9165,103 @@ msgid "hungry level %d"
 msgstr "уровень голода %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Неизвестная ошибка навыков: %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr "Неисвестная ошибка умений: %d."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "У Вас недостаточный уровень!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Недостаточно ОЖ!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Недостаточно Маны!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "У Вас нет записей!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Вы не можете сделать это сейчас!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Похоже, Вам нужно больше денег... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Вы не можете использовать этот навык с данным видом оружия!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Вам нужен другой красный камень!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Вам нужен другой синий камень!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Вы несёте слишком много, чтобы сделать это!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr "Ошибка вызова монстра."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr "Необходима сущьность."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr "Необходимо снаряжение %s."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr "Нужно снаряжение %s в количестве %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr "Нужен предмет %s."
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr "Нужен предмет %s в количестве %d."
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr "Выберите точку назначения"
 
@@ -10436,56 +10486,56 @@ msgstr ""
 "\"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d неделя"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr "%d недель"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d день"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr "%d дней"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d час"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr "%d часов"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d минута"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr "%d минут"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d секунда"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
diff --git a/po/sr.po b/po/sr.po
index ebc61b3f6..7a1bd370e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-30 15:18+0300\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
 "PO-Revision-Date: 2016-01-30 09:31+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
@@ -22,7 +22,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr ""
 
@@ -35,15 +35,15 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -63,46 +63,57 @@ msgstr "U redu"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr ""
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+msgid "You not saw this nick."
+msgstr ""
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "Šapućem prema %s: %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -271,7 +282,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr ""
 
@@ -290,12 +301,12 @@ msgid "miss"
 msgstr "promašaj"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr ""
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr ""
 
@@ -306,53 +317,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -362,53 +373,53 @@ msgstr[2] "Pokupio %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -418,8 +429,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr ""
 
@@ -461,7 +472,7 @@ msgstr ""
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Video"
 
@@ -508,7 +519,7 @@ msgstr "Pomoć"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zatvori"
@@ -737,7 +748,6 @@ msgstr ""
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ne postoji i ne može da se napravi! Izlazim."
@@ -759,6 +769,12 @@ msgstr "Greška prilikom kreiranja \"updates\" direktorijuma!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Greška: %s ne postoji i ne može da se napravi! Izlazim."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s ne postoji i ne može da se napravi! Izlazim."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -776,36 +792,36 @@ msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "Opšte"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr ""
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr ""
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr ""
 
@@ -1213,7 +1229,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr ""
 
@@ -1397,8 +1413,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr ""
 
@@ -1730,14 +1746,14 @@ msgstr ""
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1877,11 +1893,11 @@ msgstr ""
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr ""
 
@@ -1895,10 +1911,10 @@ msgstr ""
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr ""
@@ -1908,7 +1924,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr ""
 
@@ -1934,7 +1950,7 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr ""
 
@@ -2018,8 +2034,8 @@ msgstr "Igrači"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr ""
 
@@ -2032,7 +2048,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Dodaj u prozor za ćaskanje"
 
@@ -2047,8 +2063,8 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr ""
 
@@ -2056,7 +2072,7 @@ msgstr ""
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr ""
 
@@ -2098,7 +2114,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr ""
 
@@ -2151,8 +2167,8 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2238,9 +2254,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr ""
 
@@ -2313,9 +2329,9 @@ msgstr "Uzmi sve"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2323,46 +2339,46 @@ msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr ""
 
@@ -2370,30 +2386,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2401,7 +2417,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2410,135 +2426,135 @@ msgstr "Nivo: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignoriši"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr ""
 
@@ -2546,67 +2562,67 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2673,7 +2689,7 @@ msgstr "Ćaskanje"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2960,19 +2976,19 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Novac: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr ""
 
@@ -2983,7 +2999,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -2999,7 +3015,7 @@ msgstr ""
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr ""
 
@@ -3011,7 +3027,7 @@ msgstr ""
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr ""
@@ -3023,7 +3039,7 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr ""
 
@@ -3995,30 +4011,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "Uključi karticu za trgovanje"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4027,12 +4049,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4041,12 +4063,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4057,12 +4079,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4532,7 +4554,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr ""
 
@@ -4911,21 +4933,26 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
-msgid "Use special diagonal speed in players moving"
+msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:128
-msgid "Log players actions (for GM)"
+msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:132
-msgid "Create screenshots for each complete trades"
+msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:136
+msgid "Create screenshots for each complete trades"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5063,8 +5090,8 @@ msgstr "Stil promenjen"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Zatvori i onda ponovo otvori svoj klijent da bi izmene proradile."
 
@@ -5145,109 +5172,109 @@ msgid "Button %u action"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "Preko celog ekrana"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "Ograničen FPS:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Alternativno FPS ograničenje: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Poseban kursor"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -6100,25 +6127,35 @@ msgid "Enter password:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Prisutnost: %s; %d igrača je prisutno."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Šapućem prema %s: %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+msgid "Moved: "
+msgstr ""
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6281,12 +6318,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6494,7 +6531,7 @@ msgid "Update host: %s"
 msgstr ""
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr ""
 
@@ -6654,22 +6691,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr ""
 
@@ -6837,7 +6874,7 @@ msgid "Reset Windows"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr ""
 
@@ -6869,40 +6906,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6937,13 +6974,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7264,7 +7301,7 @@ msgid "Completed"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "Ko je dostupan - Ažuriranje"
 
@@ -7279,12 +7316,12 @@ msgid "Who Is Online - "
 msgstr "Ko je dostupan - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "Ko je dostupan - greška"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "Ko je dostupan - Ažuriraj"
 
@@ -7306,25 +7343,25 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7332,7 +7369,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -7413,91 +7450,97 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Udruženje ciljanog igrača:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "Izaberi \"U redu\""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr ""
 
@@ -9069,103 +9112,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10384,56 +10427,56 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "Opcije za /%s su \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index e97998d7c..ece010adc 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: 2016-01-30 15:18+0300\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
 "PO-Revision-Date: 2016-01-30 09:31+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr ""
 
@@ -33,15 +33,15 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -61,46 +61,58 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr "Cache rensad"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klientupptid: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr ""
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+#, fuzzy
+msgid "You not saw this nick."
+msgstr "Kan inte stjäla något..."
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "Viskar till %s: %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -269,7 +281,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "Synlig på karta"
 
@@ -288,12 +300,12 @@ msgid "miss"
 msgstr "missa"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "I"
 
@@ -304,53 +316,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "Försökte plocka upp icke existerande item."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "Item är för tung."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "Item:en är för långt bort."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "Inventory är fullt."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "Stack är för stor."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "Item:et tillhör någon annan."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "Okänt fel vid upplockning av item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -359,53 +371,53 @@ msgstr[1] "You picked up %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "jobb"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr "Follow: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "Follow avbruten"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitation: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "Imitation avbruten"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr "Du ser %s"
@@ -415,8 +427,8 @@ msgstr "Du ser %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -458,7 +470,7 @@ msgstr ""
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Video"
 
@@ -505,7 +517,7 @@ msgstr "Hjälp"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Stäng"
@@ -737,7 +749,6 @@ msgstr "  -O --no-opengl      : Avaktivera OpenGL för denna session"
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existerar inte och kan inte bli skapat! Avslutar."
@@ -759,6 +770,12 @@ msgstr "Error uppstod då uppdateringskatalog skulle skapas!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: %s existerar inte och kan inte bli skapat! Avslutar."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s existerar inte och kan inte bli skapat! Avslutar."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -776,36 +793,36 @@ msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Skärmdump sparades som %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Spara skärmdump misslyckades!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Anslutningen till servern förlorades."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Nätverksfel"
 
@@ -1213,7 +1230,7 @@ msgstr "Meddelande"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr "Återuppliva"
 
@@ -1397,8 +1414,8 @@ msgstr "Skitstor (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1730,14 +1747,14 @@ msgstr "Skapa Party"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1877,11 +1894,11 @@ msgstr "Prata med"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Köp"
 
@@ -1895,10 +1912,10 @@ msgstr "Köp"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Sälj"
@@ -1908,7 +1925,7 @@ msgstr "Sälj"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr ""
 
@@ -1934,7 +1951,7 @@ msgstr "Lägg till i attacklistan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Lägg till i ignoreringslistan"
 
@@ -2018,8 +2035,8 @@ msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Kicka från party"
 
@@ -2032,7 +2049,7 @@ msgstr "Pick up"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
@@ -2047,8 +2064,8 @@ msgstr "Kartobjekt"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -2056,7 +2073,7 @@ msgstr "Ta bort"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr "Warpa"
 
@@ -2098,7 +2115,7 @@ msgstr "Ändra spell"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Clear"
 
@@ -2151,8 +2168,8 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
@@ -2238,9 +2255,9 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Lagra"
 
@@ -2313,9 +2330,9 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2323,46 +2340,46 @@ msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "Återställ yellow bar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2370,30 +2387,30 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Visa fönster"
 
@@ -2401,7 +2418,7 @@ msgstr "Visa fönster"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2410,135 +2427,135 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Ta bort från pickup-listan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Lägg till i pickup-listan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -2546,67 +2563,67 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "Släng"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Sparka"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2673,7 +2690,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2960,19 +2977,19 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Money: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr "Eq."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr "Öppna url"
 
@@ -2983,7 +3000,7 @@ msgstr "Öppna url"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -2999,7 +3016,7 @@ msgstr "Lägg till"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -3011,7 +3028,7 @@ msgstr "Avsluta"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3023,7 +3040,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3995,30 +4012,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "Aktivera attack-filter"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "Tid"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "Använd lokal tid"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr "Highlighta ord (separerat med komma)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4027,12 +4050,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4041,12 +4064,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4057,12 +4080,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4532,7 +4555,7 @@ msgstr "Aktivera shop mode"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4912,21 +4935,26 @@ msgstr "Dölj raderade spelares nicks"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
-msgid "Use special diagonal speed in players moving"
+msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:128
-msgid "Log players actions (for GM)"
+msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:132
-msgid "Create screenshots for each complete trades"
+msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:136
+msgid "Create screenshots for each complete trades"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5064,8 +5092,8 @@ msgstr "Tema ändrat"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Starta om din klient för att ändringarna ska utföras."
 
@@ -5146,61 +5174,61 @@ msgid "Button %u action"
 msgstr "Knapp %u händelse"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "Fullskärm"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "FPS-begränsning:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Alternativ FPS-begränsning: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr "Upptäck bästa läget"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr "Visa muspekare"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Anpassad muspekare"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr "Aktivera storlekändring"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr "Ingen ram"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "Ingen"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5208,7 +5236,7 @@ msgstr ""
 "läget misslyckades också!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5216,43 +5244,43 @@ msgstr ""
 "läget misslyckades också!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "Ändrar till Fullskärm"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "Omstart behövs för att ändringar ska genomföras."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "Ändrar till OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "Tillämpar ändringar till OpenGL, behöver omstart."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Anpassad upplösning (exempel: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "Skriv in ny upplösning:              "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "Skärmupplösning ändrad"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Vissa fönster kan flyttas på för att passa i lägre upplösning."
 
@@ -6110,25 +6138,36 @@ msgid "Enter password:"
 msgstr "Skriv lösenord:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentera: %s; %d spelare är presenterad."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "Flytta"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6293,12 +6332,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6504,7 +6543,7 @@ msgid "Update host: %s"
 msgstr "Uppdatera host: %s"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr "Öppna register-url"
 
@@ -6664,22 +6703,22 @@ msgid "Job level: %d"
 msgstr "Jobb level: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Sluta vänta"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Nästa"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Submit"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Återställ"
 
@@ -6847,7 +6886,7 @@ msgid "Reset Windows"
 msgstr "Återställ fönster"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "Personlig Shop"
 
@@ -6879,40 +6918,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Efterfråga Trade"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6947,13 +6986,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7276,7 +7315,7 @@ msgid "Completed"
 msgstr "Färdig"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "Vem är Online - Uppdaterar"
 
@@ -7291,12 +7330,12 @@ msgid "Who Is Online - "
 msgstr "Vem är Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "Vem är Online - error"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "Vem är Online - Uppdatering"
 
@@ -7318,25 +7357,25 @@ msgstr "Välj värld"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr "okänd eller borttappad tangent"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7344,7 +7383,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u-tangenten"
 
@@ -7425,91 +7464,97 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Target level:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr "Andra tangenter"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "Pickup"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "Ändra Pickup-typ"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "Sitt"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "Skärmdump"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "Aktivera/Avaktivera Trading"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "Ändra Kartvy-läge"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "Välj OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr "Stanna eller sitt"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr "Återgå till säkert video-läge"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr ""
 
@@ -9086,103 +9131,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du har ännu inte nått required lvl!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Otillräckligt HP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Otillräckligt SP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Du har inga memos!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Du kan inte göra det just nu!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Verkar som att du behöver mer money... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kan inte använda denna skill med det vapnet!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Du behöver en till röd gem!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Du behöver en till blå gem!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Du bär för mycket för att kunna göra detta!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10403,56 +10448,56 @@ msgstr ""
 "\"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d vecka"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr "%d veckor"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d dag"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr "%d dagar"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d timme"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr "%d timmar"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d minut"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuter"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d sekund"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index e97998d7c..ece010adc 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: 2016-01-30 15:18+0300\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
 "PO-Revision-Date: 2016-01-30 09:31+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
@@ -20,7 +20,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr ""
 
@@ -33,15 +33,15 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -61,46 +61,58 @@ msgstr "OK"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr "Cache rensad"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Klientupptid: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "Resurs-bilder:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "Föräldralösa resurs-bilder:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr "Omgivningsvariabler dumpade"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr ""
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+#, fuzzy
+msgid "You not saw this nick."
+msgstr "Kan inte stjäla något..."
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "Viskar till %s: %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -269,7 +281,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "Synlig på karta"
 
@@ -288,12 +300,12 @@ msgid "miss"
 msgstr "missa"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "I"
 
@@ -304,53 +316,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "Försökte plocka upp icke existerande item."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "Item är för tung."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "Item:en är för långt bort."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "Inventory är fullt."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "Stack är för stor."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "Item:et tillhör någon annan."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "Okänt fel vid upplockning av item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -359,53 +371,53 @@ msgstr[1] "You picked up %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "jobb"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr "Follow: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "Follow avbruten"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr "Imitation: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "Imitation avbruten"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr "Du ser %s"
@@ -415,8 +427,8 @@ msgstr "Du ser %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -458,7 +470,7 @@ msgstr ""
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Video"
 
@@ -505,7 +517,7 @@ msgstr "Hjälp"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Stäng"
@@ -737,7 +749,6 @@ msgstr "  -O --no-opengl      : Avaktivera OpenGL för denna session"
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existerar inte och kan inte bli skapat! Avslutar."
@@ -759,6 +770,12 @@ msgstr "Error uppstod då uppdateringskatalog skulle skapas!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: %s existerar inte och kan inte bli skapat! Avslutar."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s existerar inte och kan inte bli skapat! Avslutar."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -776,36 +793,36 @@ msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "General"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Debug"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Skärmdump sparades som %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Spara skärmdump misslyckades!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Anslutningen till servern förlorades."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Nätverksfel"
 
@@ -1213,7 +1230,7 @@ msgstr "Meddelande"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr "Återuppliva"
 
@@ -1397,8 +1414,8 @@ msgstr "Skitstor (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1730,14 +1747,14 @@ msgstr "Skapa Party"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1877,11 +1894,11 @@ msgstr "Prata med"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Köp"
 
@@ -1895,10 +1912,10 @@ msgstr "Köp"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Sälj"
@@ -1908,7 +1925,7 @@ msgstr "Sälj"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr ""
 
@@ -1934,7 +1951,7 @@ msgstr "Lägg till i attacklistan"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Lägg till i ignoreringslistan"
 
@@ -2018,8 +2035,8 @@ msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Kicka från party"
 
@@ -2032,7 +2049,7 @@ msgstr "Pick up"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
@@ -2047,8 +2064,8 @@ msgstr "Kartobjekt"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -2056,7 +2073,7 @@ msgstr "Ta bort"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr "Warpa"
 
@@ -2098,7 +2115,7 @@ msgstr "Ändra spell"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Clear"
 
@@ -2151,8 +2168,8 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
@@ -2238,9 +2255,9 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Lagra"
 
@@ -2313,9 +2330,9 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2323,46 +2340,46 @@ msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "Återställ yellow bar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2370,30 +2387,30 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Visa fönster"
 
@@ -2401,7 +2418,7 @@ msgstr "Visa fönster"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2410,135 +2427,135 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Ta bort från pickup-listan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Lägg till i pickup-listan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -2546,67 +2563,67 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "Släng"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Sparka"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2673,7 +2690,7 @@ msgstr "Chat"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2960,19 +2977,19 @@ msgstr "Level: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Money: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr "Eq."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr "Öppna url"
 
@@ -2983,7 +3000,7 @@ msgstr "Öppna url"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -2999,7 +3016,7 @@ msgstr "Lägg till"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Avsluta"
 
@@ -3011,7 +3028,7 @@ msgstr "Avsluta"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3023,7 +3040,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3995,30 +4012,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "Aktivera attack-filter"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "Tid"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "Använd lokal tid"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr "Highlighta ord (separerat med komma)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4027,12 +4050,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4041,12 +4064,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4057,12 +4080,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4532,7 +4555,7 @@ msgstr "Aktivera shop mode"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4912,21 +4935,26 @@ msgstr "Dölj raderade spelares nicks"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
-msgid "Use special diagonal speed in players moving"
+msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:128
-msgid "Log players actions (for GM)"
+msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:132
-msgid "Create screenshots for each complete trades"
+msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:136
+msgid "Create screenshots for each complete trades"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5064,8 +5092,8 @@ msgstr "Tema ändrat"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Starta om din klient för att ändringarna ska utföras."
 
@@ -5146,61 +5174,61 @@ msgid "Button %u action"
 msgstr "Knapp %u händelse"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "Fullskärm"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "FPS-begränsning:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Alternativ FPS-begränsning: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr "Upptäck bästa läget"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr "Visa muspekare"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Anpassad muspekare"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr "Aktivera storlekändring"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr "Ingen ram"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "Ingen"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
@@ -5208,7 +5236,7 @@ msgstr ""
 "läget misslyckades också!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
@@ -5216,43 +5244,43 @@ msgstr ""
 "läget misslyckades också!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "Ändrar till Fullskärm"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "Omstart behövs för att ändringar ska genomföras."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "Ändrar till OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "Tillämpar ändringar till OpenGL, behöver omstart."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Anpassad upplösning (exempel: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "Skriv in ny upplösning:              "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "Skärmupplösning ändrad"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Vissa fönster kan flyttas på för att passa i lägre upplösning."
 
@@ -6110,25 +6138,36 @@ msgid "Enter password:"
 msgstr "Skriv lösenord:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentera: %s; %d spelare är presenterad."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Viskar till %s: %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "Flytta"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6293,12 +6332,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6504,7 +6543,7 @@ msgid "Update host: %s"
 msgstr "Uppdatera host: %s"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr "Öppna register-url"
 
@@ -6664,22 +6703,22 @@ msgid "Job level: %d"
 msgstr "Jobb level: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Sluta vänta"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Nästa"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Submit"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Återställ"
 
@@ -6847,7 +6886,7 @@ msgid "Reset Windows"
 msgstr "Återställ fönster"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "Personlig Shop"
 
@@ -6879,40 +6918,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Efterfråga Trade"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6947,13 +6986,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7276,7 +7315,7 @@ msgid "Completed"
 msgstr "Färdig"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "Vem är Online - Uppdaterar"
 
@@ -7291,12 +7330,12 @@ msgid "Who Is Online - "
 msgstr "Vem är Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "Vem är Online - error"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "Vem är Online - Uppdatering"
 
@@ -7318,25 +7357,25 @@ msgstr "Välj värld"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr "okänd eller borttappad tangent"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7344,7 +7383,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u-tangenten"
 
@@ -7425,91 +7464,97 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Target level:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr "Andra tangenter"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "Pickup"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "Ändra Pickup-typ"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "Sitt"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "Skärmdump"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "Aktivera/Avaktivera Trading"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "Ändra Kartvy-läge"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "Välj OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr "Stanna eller sitt"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr "Återgå till säkert video-läge"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr ""
 
@@ -9086,103 +9131,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Du har ännu inte nått required lvl!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Otillräckligt HP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Otillräckligt SP!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Du har inga memos!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Du kan inte göra det just nu!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Verkar som att du behöver mer money... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Du kan inte använda denna skill med det vapnet!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Du behöver en till röd gem!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Du behöver en till blå gem!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Du bär för mycket för att kunna göra detta!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10403,56 +10448,56 @@ msgstr ""
 "\"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d vecka"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr "%d veckor"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d dag"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr "%d dagar"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d timme"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr "%d timmar"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d minut"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr "%d minuter"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d sekund"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
diff --git a/po/tr.po b/po/tr.po
index 8164d2700..08220328b 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: 2016-01-30 15:18+0300\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
 "PO-Revision-Date: 2016-01-30 09:31+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
@@ -22,7 +22,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr "Dosya yüklendi"
 
@@ -35,15 +35,15 @@ msgstr "Dosya yüklendi"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -63,46 +63,57 @@ msgstr "TAMAM"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr "Bellek temizlendi"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Client çalışma süresi: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "Kaynak resimleri:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "Edinilmiş kaynak resimleri:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr "Çevre değişkenleri yığıldı"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr "Config bilgisi şuraya yüklendi:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr "Server configi şuraya yüklendi:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr "Log kayıtları şuraya yüklendi:"
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+msgid "You not saw this nick."
+msgstr ""
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "%s 'e fısıldanıyor: %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -271,7 +282,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "Haritada görünür"
 
@@ -290,12 +301,12 @@ msgid "miss"
 msgstr "kaçırıldı"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "İ"
 
@@ -306,53 +317,53 @@ msgid "You were killed by %s."
 msgstr "%s tarafından öldürüldün."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "Var olmayan item toplanmaya çalışıldı."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "İtem çok ağır."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "İtem çok uzakta."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "Envanter dolu."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "Küme çok büyük."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "İtem başkasına ait."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr "Bu miktardaki itemi alamazsınız."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr "İtem kümesi maksimum miktarda."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "İtem toplamada bilinmeyen hata."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -361,53 +372,53 @@ msgstr[1] ""
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "xp"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "iş"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr "Takip et: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "Takip iptal edildi."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr "Taklit: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "Taklit iptal edildi"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr "%s görüyorsun"
@@ -417,8 +428,8 @@ msgstr "%s görüyorsun"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Tamamen görmezden gel"
 
@@ -460,7 +471,7 @@ msgstr "Performans"
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Video"
 
@@ -507,7 +518,7 @@ msgstr "Yardım"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Kapat"
@@ -736,7 +747,6 @@ msgstr ""
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s yok ve yaratılamıyor! Çıkış yapılıyor."
@@ -758,6 +768,12 @@ msgstr "Güncelleme klasörleri yaratılırken hata oluştu!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Hata: %s bulunamadı ve yaratılamıyor! Çıkış yapılıyor."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s yok ve yaratılamıyor! Çıkış yapılıyor."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -775,36 +791,36 @@ msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "Genel"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Hata ayıklama"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Ekran görüntüsü %s olarak kaydedildi"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Ekran görüntüsü kaydı başarısız!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Sunucu bağlantısı koptu."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Ağ Hatası"
 
@@ -1212,7 +1228,7 @@ msgstr "Mesaj"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr "Dirilt"
 
@@ -1400,8 +1416,8 @@ msgstr "Kocaman (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(varsayılan)"
 
@@ -1733,14 +1749,14 @@ msgstr "Parti kur"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1880,11 +1896,11 @@ msgstr "Konuş"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Satın Al"
 
@@ -1898,10 +1914,10 @@ msgstr "Satın Al"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Sat"
@@ -1911,7 +1927,7 @@ msgstr "Sat"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Yorum ekle"
 
@@ -1937,7 +1953,7 @@ msgstr "Saldırı listesine ekle"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Gözmezden gelinenler listesine ekle"
 
@@ -2021,8 +2037,8 @@ msgstr "Oyuncular"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Partiden at"
 
@@ -2035,7 +2051,7 @@ msgstr "Topla"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Sohbete ekle"
 
@@ -2050,8 +2066,8 @@ msgstr "Harita itemi"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Kaldır"
 
@@ -2059,7 +2075,7 @@ msgstr "Kaldır"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr "Dönüştür"
 
@@ -2101,7 +2117,7 @@ msgstr "Büyü düzenle"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Temizle"
 
@@ -2154,8 +2170,8 @@ msgstr "Ayrıl"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Panoya kopyala"
 
@@ -2241,9 +2257,9 @@ msgstr "Tamamını takasa ekle"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Sakla"
 
@@ -2316,9 +2332,9 @@ msgstr "Tamamını geri al"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2326,46 +2342,46 @@ msgid "Use"
 msgstr "Kullan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr ""
 
@@ -2373,30 +2389,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2404,7 +2420,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2413,135 +2429,135 @@ msgstr "Seviye: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "İhmal et"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Görmezden gel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Görmezden gelmeyi bırak"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Satın Al (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Gruba davet et"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Nesneleri göster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Toplama listesinden kaldır"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Toplama listesine ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "Bırak..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr ""
 
@@ -2549,67 +2565,67 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "Bırak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2676,7 +2692,7 @@ msgstr "Sohbet"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2963,19 +2979,19 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Para: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr ""
 
@@ -2986,7 +3002,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -3002,7 +3018,7 @@ msgstr "Ekle"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Çıkış"
 
@@ -3014,7 +3030,7 @@ msgstr "Çıkış"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3026,7 +3042,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3999,30 +4015,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "Takas penceresini etkinleştir"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4031,12 +4053,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4045,12 +4067,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4061,12 +4083,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4536,7 +4558,7 @@ msgstr "Mağaza modunu etkinleştir"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4915,21 +4937,26 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
-msgid "Use special diagonal speed in players moving"
+msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:128
-msgid "Log players actions (for GM)"
+msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:132
-msgid "Create screenshots for each complete trades"
+msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:136
+msgid "Create screenshots for each complete trades"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5067,8 +5094,8 @@ msgstr "Tema Değiştirildi"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Değişikliklerin etkinleşmesi için istemcinizi tekrar başlatın."
 
@@ -5149,109 +5176,109 @@ msgid "Button %u action"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "Tam ekran"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "FPS limiti:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Alternatif FPS limiti: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Özel imleç"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "Hiç"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "Pencere görünümüne geçilemedi ve eski hale geri dönüş başarısız oldu!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Tam ekrana geçilemedi ve eski hale geri dönüş başarısız oldu!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "Tam Ekrana Geçiliyor"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "Değişikliklerin etkili olması için yeniden başlatma gerekli."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "OpenGL'ye Değiştiriliyor"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "OpenGL değişikliklerini uygulamak için yeniden başlatma gereklidir."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Özel çözünürlük (örnek: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "Yeni çözünürlük gir:                 "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "Ekran Çözünürlüğü Değiştirildi"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Bazı pencereler düşürülmüş çözünürlüğe uyması için taşınmış olabilir."
 
@@ -6104,25 +6131,36 @@ msgid "Enter password:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Mevcut: %s; %d oyuncu mevcut."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "%s 'e fısıldanıyor: %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "Taşı"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6285,12 +6323,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6496,7 +6534,7 @@ msgid "Update host: %s"
 msgstr ""
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr ""
 
@@ -6656,22 +6694,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "İleri"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Onayla"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Sıfırla"
 
@@ -6839,7 +6877,7 @@ msgid "Reset Windows"
 msgstr "Pencereleri sıfırla"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "Kişisel Mağaza"
 
@@ -6871,40 +6909,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Takas isteği yolla"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6939,13 +6977,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7268,7 +7306,7 @@ msgid "Completed"
 msgstr "Tamamlandı"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "Kimler Online - Güncelleniyor"
 
@@ -7283,12 +7321,12 @@ msgid "Who Is Online - "
 msgstr "Kimler Online - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "Kimler Online - hata"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "Kimler Online - Güncelle"
 
@@ -7310,25 +7348,25 @@ msgstr "Dünya Seç"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7336,7 +7374,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -7417,91 +7455,97 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Lonca Hedefle:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "Topla"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "Toplama Tipini Değiştir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "Otur"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "Ekran Görüntüsü"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "Takası Aktifleştir/Deaktifleştir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "Harita Görüş Modunu değiştir"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "Seçim Tamam"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr ""
 
@@ -9073,103 +9117,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10389,56 +10433,56 @@ msgstr ""
 "/%s ayar seçenekleri \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\" 'dir."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d hafta"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr "%d haftalar"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d gün"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr "%d günler"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d saat"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr "%d saatler"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d dakika"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr "%d dakikalar"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d saniye"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr "%d saniyeler"
diff --git a/po/uk.po b/po/uk.po
index d322bef78..1216363b0 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: 2016-01-30 15:18+0300\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
 "PO-Revision-Date: 2016-01-30 09:31+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
@@ -23,7 +23,7 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr "Файл завантажено"
 
@@ -36,15 +36,15 @@ msgstr "Файл завантажено"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -64,46 +64,58 @@ msgstr "ОК"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr "Кеш прибрано"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "Час безперервної роботи клієнта: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "Зображень:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "Вилучених зображень:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr "Змінні середовища збережені"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr "Завантажений конфіг:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr "Завантажена конфігурація сервера:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr "Завантажений лог:"
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+#, fuzzy
+msgid "You not saw this nick."
+msgstr "Нічого не вдалось поцупити..."
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "Шепчу до %s: %s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -274,7 +286,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "Видимий на мапі"
 
@@ -293,12 +305,12 @@ msgid "miss"
 msgstr "промах"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "I"
 
@@ -309,53 +321,53 @@ msgid "You were killed by %s."
 msgstr "Вас вбив %s."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "Спроби підняти неіснуючий предмет."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "Предмет занадто важкий."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "Предмет задалеко щоб підняти."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "В сумці немає місця."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "Забагато предметів у купі."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "Предмет належить комусь іншому."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr "Не можливо підняти стільки предметів."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr "Кількість цих предметів досягла межі."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "Невстановлена помилка під час спроби підняти предмет."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -365,53 +377,53 @@ msgstr[2] "Ви підняли %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "досвід"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "робота"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr "Йти слідом за: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "Слідкування відмінено"
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr "Імітація: %s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "Імітацію відмінено"
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr "Ти бачиш %s"
@@ -421,8 +433,8 @@ msgstr "Ти бачиш %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "Остаточно ігнорувати"
 
@@ -464,7 +476,7 @@ msgstr "Продуктивність"
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "Відео"
 
@@ -511,7 +523,7 @@ msgstr "Довідка"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Закрити"
@@ -742,7 +754,6 @@ msgstr "  -O --no-opengl      : Вимкнути OpenGL під час цієї �
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "Тека %s не існує і не може бути створена! Виходимо."
@@ -764,6 +775,12 @@ msgstr "Неможливо створити теку для оновлень!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Помилка: тека %s не існує і не може бути створена! Виходимо."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "Тека %s не існує і не може бути створена! Виходимо."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -781,36 +798,36 @@ msgstr "dyecmd файл_рядків_кольору файл_призначен�
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "Загальне"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "Зневадження"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "Скріншот збережено як %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "Збереження скріншоту провалилось!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "Втрачено з'єднання з сервером."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "Мережева помилка"
 
@@ -1218,7 +1235,7 @@ msgstr "Повідомлення"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr "Опритомнити"
 
@@ -1404,8 +1421,8 @@ msgstr "Величезний (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(за замовчуванням)"
 
@@ -1737,14 +1754,14 @@ msgstr "Створити групу"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1884,11 +1901,11 @@ msgstr "Діалог"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Придбати"
 
@@ -1902,10 +1919,10 @@ msgstr "Придбати"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Продати"
@@ -1915,7 +1932,7 @@ msgstr "Продати"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "Додати примітку"
 
@@ -1941,7 +1958,7 @@ msgstr "Додати до списку атаки"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "Ігнорувати тип мобу"
 
@@ -2025,8 +2042,8 @@ msgstr "Гравці"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "Виштовхати з групи"
 
@@ -2039,7 +2056,7 @@ msgstr "Підняти"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "Додати до чату"
 
@@ -2054,8 +2071,8 @@ msgstr "Елемент карти"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "Видалити"
 
@@ -2063,7 +2080,7 @@ msgstr "Видалити"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr "Телепорт"
 
@@ -2105,7 +2122,7 @@ msgstr "Редагувати заклинання"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "Скинути"
 
@@ -2158,8 +2175,8 @@ msgstr "Залишити"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "Внести в буфер обміну"
 
@@ -2245,9 +2262,9 @@ msgstr "Додати всю кількість"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "Зберегти"
 
@@ -2320,9 +2337,9 @@ msgstr "Вилучити всю кількість"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2330,46 +2347,46 @@ msgid "Use"
 msgstr "Використати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "Скинути значення комірців"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "Сховати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "Показати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "Скинути Жовтий рядок"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "Додати до чату"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "Пріоритет вище"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "Пріоритет нижче"
 
@@ -2377,30 +2394,30 @@ msgstr "Пріоритет нижче"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "Роздягнути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "Копіювати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "Вставити"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "Відвідати посилання"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "Показати вікно"
 
@@ -2408,7 +2425,7 @@ msgstr "Показати вікно"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2417,135 +2434,135 @@ msgstr "Рівень: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "Зневажати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ігнорувати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "В чорний список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "Позначити супротивником"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "Стерти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "Приятелювати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "Повернути з ігнору"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "Іти слідом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "Купувати (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "Продати (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "Запросити до групи"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr "Ввійти до чату %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "Показати спорядження"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "Видалити зі списку підбирання"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "Додати до списку підбирання"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "Зняти захист"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "Захистити предмет"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "Кинути..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "Кинути все"
 
@@ -2553,67 +2570,67 @@ msgstr "Кинути все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "Кинути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "ГМ команди"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "Перевірити IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "Відвідати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "Викликати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "Виштовхати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2680,7 +2697,7 @@ msgstr "Чат"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2967,19 +2984,19 @@ msgstr "Рівень: %u"
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "Кошти: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr "Вдяг."
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr "Відвідати посилання"
 
@@ -2990,7 +3007,7 @@ msgstr "Відвідати посилання"
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -3006,7 +3023,7 @@ msgstr "Додати"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "Вийти"
 
@@ -3018,7 +3035,7 @@ msgstr "Вийти"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3030,7 +3047,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -4002,30 +4019,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "Ввімкнути фільтр атаки"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "Час"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "Вживати місцевий час"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr "Підсвічувані слова (відокремлені комами)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4034,12 +4057,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr "Ігнорування глобальні повідомлення від (відокремити комами)"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4048,12 +4071,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr "Показати кнопку смайликів у чаті"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4064,12 +4087,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr "Показувати серверне привітання"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4539,7 +4562,7 @@ msgstr "Ввімкнути режим крамниці"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4921,21 +4944,26 @@ msgstr "Ховати імена стертих гравців"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
+msgid "Collect players id and seen log"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:128
 msgid "Use special diagonal speed in players moving"
 msgstr "Вжити спеціальну діагональну швидкість під час руху"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:128
+#: src/gui/widgets/tabs/setup_players.cpp:132
 msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:132
+#: src/gui/widgets/tabs/setup_players.cpp:136
 msgid "Create screenshots for each complete trades"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_players.cpp:136
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5075,8 +5103,8 @@ msgstr "Дата модифікації"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "Перезавантажте клієнт, щоб застосувати зміни."
 
@@ -5157,109 +5185,109 @@ msgid "Button %u action"
 msgstr "Дія кнопки %u"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "На повний екран"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "Обмеження частоти кадрів:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr "Альтернативний FPS ліміт: "
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr "Визначити кращій режим"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr "Показувати вказівник"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "Гарний вказівник"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr "Дозволити змінювати розмір клієнту"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr "Без рамки"
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "Ні"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "Не вдалося встановити режим і відновити попередній!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr "Не вдалося встановити режим і відновити попередній!"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "Перемикання на повний екран"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "Потрібно перезапустити для застосування змін."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "Перемикання OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "Потрібно перезапустити для застосування змін OpenGL."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "Користовацька роздільність (наприклад, 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "Введіть нову роздільність:           "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "Розподільчу здатність встановлено"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr "Вікна можуть змінювати позиції при зменшені розміру клієнту."
 
@@ -6117,25 +6145,36 @@ msgid "Enter password:"
 msgstr "Пароль:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Присутні: %s; %d гравців онлайн."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Шепчу до %s: %s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "Рух"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr "%s'ів улюбленець"
@@ -6298,12 +6337,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6511,7 +6550,7 @@ msgid "Update host: %s"
 msgstr "Сервер оновлень: %s"
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr "Відкрити посилання реєстрації"
 
@@ -6671,22 +6710,22 @@ msgid "Job level: %d"
 msgstr "Рівень роботи: %d"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr "Зупинити очікування"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "Далі"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "Відправити"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "Скинути"
 
@@ -6854,7 +6893,7 @@ msgid "Reset Windows"
 msgstr "Скинути налаштування вікон"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "Особиста крамниця"
 
@@ -6886,40 +6925,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "Запит на торгівлю"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6954,13 +6993,13 @@ msgid "Failed skill: %s"
 msgstr "Невдале вміння: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7281,7 +7320,7 @@ msgid "Completed"
 msgstr "Завершено"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "Хто онлайн - оновлюється"
 
@@ -7296,12 +7335,12 @@ msgid "Who Is Online - "
 msgstr "Хто онлайн - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "Хто онлайн - помилка"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "Хто онлайн - оновити"
 
@@ -7323,25 +7362,25 @@ msgstr "Оберіть світ"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "клавіша_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr "КлавішаДж%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr "невідома клавіша"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr "ДЖ%d"
@@ -7349,7 +7388,7 @@ msgstr "ДЖ%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "невід."
 
@@ -7430,91 +7469,97 @@ msgstr "Вибрати крамаря"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "Рівень цілі:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr "Вибрати улюбленця"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr "Зловити улюбленця"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr "Інші клавіші"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "Підняти"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "Змінити тип підбирання"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "Присісти"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "Скріншот"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "Ввімкнути/вимкнути торгівлю"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr "Відкрити вікно торгівлі"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr "Торгувати з ціллю"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr "Йти слідом за вибраним гравцем"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "Змінити режим мапи"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "Вибрати ОК"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr "Зупинитись або присісти"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr "Повернутись до безпечного відеорежиму"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr "Звільнити гомункула"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr "Відкрити контекстне меню"
 
@@ -9088,103 +9133,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr "Невідома похибка вміння: %d"
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "У вас недостатній рівень!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "Недостатньо здоров'я!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "Недостатньо мани!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "Записи порожні!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "Не можна зробити це прямо зараз!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "Здається, в вас замало грошей... ;C"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Не можна вжити вміння з цим типом зброї!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "Вам потрібен інший червоний самоцвіт!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "Вам потрібний інший синій самоцвіт!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "Ви забагато тримаєте, щоб це зробити!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10405,56 +10450,56 @@ msgstr ""
 "\"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d тиждень"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr "%d тижнів"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d день"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr "%d днів"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d година"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr "%d годин"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d хвилина"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr "%d хвилин"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d секунда"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 30b463d6d..71de904c1 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: 2016-01-30 15:18+0300\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
 "PO-Revision-Date: 2016-01-30 09:31+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
@@ -27,7 +27,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr ""
 
@@ -40,15 +40,15 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -68,46 +68,58 @@ msgstr "确定"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr ""
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr ""
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr ""
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+#, fuzzy
+msgid "You not saw this nick."
+msgstr "无法偷取任何物品..."
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "对%s密语到：%s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -276,7 +288,7 @@ msgid "Quick"
 msgstr ""
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "在地图上可见"
 
@@ -295,12 +307,12 @@ msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "I"
 
@@ -311,53 +323,53 @@ msgid "You were killed by %s."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "项目是太重了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "物品太远了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -365,53 +377,53 @@ msgstr[0] "你拾起%d[@@%d|%s @@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr ""
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -421,8 +433,8 @@ msgstr ""
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -464,7 +476,7 @@ msgstr ""
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "视频"
 
@@ -511,7 +523,7 @@ msgstr "帮助"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "关闭"
@@ -740,7 +752,6 @@ msgstr ""
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，且无法创建！正在退出."
@@ -762,6 +773,12 @@ msgstr "创建更新目录错误!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在且无法创建！正在退出."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s 不存在，且无法创建！正在退出."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -779,36 +796,36 @@ msgstr ""
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "常规"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "调试"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "网络错误"
 
@@ -1216,7 +1233,7 @@ msgstr "讯息"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr ""
 
@@ -1400,8 +1417,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1733,14 +1750,14 @@ msgstr "建立"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1880,11 +1897,11 @@ msgstr "说话"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "购买"
 
@@ -1898,10 +1915,10 @@ msgstr "购买"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "出售"
@@ -1911,7 +1928,7 @@ msgstr "出售"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "发表评论"
 
@@ -1937,7 +1954,7 @@ msgstr "加入攻击清单"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr ""
 
@@ -2021,8 +2038,8 @@ msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "踢从党"
 
@@ -2035,7 +2052,7 @@ msgstr "拾取"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "加入聊天"
 
@@ -2050,8 +2067,8 @@ msgstr "地图项"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr ""
 
@@ -2059,7 +2076,7 @@ msgstr ""
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr ""
 
@@ -2101,7 +2118,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "清除"
 
@@ -2154,8 +2171,8 @@ msgstr "留下"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr ""
 
@@ -2241,9 +2258,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "存储"
 
@@ -2316,9 +2333,9 @@ msgstr "检索所有"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2326,46 +2343,46 @@ msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "隐藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "显示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "x"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr ""
 
@@ -2373,30 +2390,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr ""
 
@@ -2404,7 +2421,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2413,135 +2430,135 @@ msgstr "等级：%d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "是朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "按照"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "购买(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "出售(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "显示项目"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "掉落..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "所有"
 
@@ -2549,67 +2566,67 @@ msgstr "所有"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "丢弃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2676,7 +2693,7 @@ msgstr "聊天"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2963,19 +2980,19 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr "金币: %s"
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr ""
 
@@ -2986,7 +3003,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -3002,7 +3019,7 @@ msgstr "添加"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "退出"
 
@@ -3014,7 +3031,7 @@ msgstr "退出"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr "+"
@@ -3026,7 +3043,7 @@ msgstr "+"
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr "-"
 
@@ -3998,30 +4015,36 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+#, fuzzy
+msgid "Enable trade spam filter"
+msgstr "启用攻击过滤器"
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr "时间"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr "使用本地时间"
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4030,12 +4053,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4044,12 +4067,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4060,12 +4083,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4533,7 +4556,7 @@ msgstr "启用商店模式"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4912,21 +4935,26 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
-msgid "Use special diagonal speed in players moving"
+msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:128
-msgid "Log players actions (for GM)"
+msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:132
-msgid "Create screenshots for each complete trades"
+msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:136
+msgid "Create screenshots for each complete trades"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5064,8 +5092,8 @@ msgstr "主题更改"
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效."
 
@@ -5146,109 +5174,109 @@ msgid "Button %u action"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "全屏"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr "FPS限制:"
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr ""
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "自定义鼠标"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr "w"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "切换到窗口模式，并恢复旧的模式，也没有失败!"
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr "切换到全屏"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "重启生效."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr "切换到OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr "自定义分辨率 (例如: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr "输入新的分辨率:                 "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr "屏幕分辨率已更改"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -6101,25 +6129,36 @@ msgid "Enter password:"
 msgstr "输入密码:"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "移动"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6282,12 +6321,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6491,7 +6530,7 @@ msgid "Update host: %s"
 msgstr ""
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr ""
 
@@ -6651,22 +6690,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "下一个"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr "提交"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr "重置"
 
@@ -6834,7 +6873,7 @@ msgid "Reset Windows"
 msgstr "重置窗口"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr "个人商店"
 
@@ -6866,40 +6905,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr "请求交易"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6934,13 +6973,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7261,7 +7300,7 @@ msgid "Completed"
 msgstr "已完成"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
@@ -7276,12 +7315,12 @@ msgid "Who Is Online - "
 msgstr "谁在线 - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
@@ -7303,25 +7342,25 @@ msgstr "选择世界"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7329,7 +7368,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -7410,91 +7449,97 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
+#, fuzzy
+msgid "Target skill unit"
+msgstr "目标公会:"
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:142
 msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:142
+#: src/input/pages/basic.cpp:148
 msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:148
+#: src/input/pages/basic.cpp:154
 msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:154
+#: src/input/pages/basic.cpp:160
 msgid "Other Keys"
 msgstr "其他按键"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:160
+#: src/input/pages/basic.cpp:166
 msgid "Pickup"
 msgstr "捡起"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:166
+#: src/input/pages/basic.cpp:172
 msgid "Change Pickup Type"
 msgstr "更改皮卡型"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:172
+#: src/input/pages/basic.cpp:178
 msgid "Sit"
 msgstr "坐下"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:178
+#: src/input/pages/basic.cpp:184
 msgid "Screenshot"
 msgstr "屏幕快照"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:184
+#: src/input/pages/basic.cpp:190
 msgid "Enable/Disable Trading"
 msgstr "开启/关闭交易"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:190
+#: src/input/pages/basic.cpp:196
 msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:196
+#: src/input/pages/basic.cpp:202
 msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:202
+#: src/input/pages/basic.cpp:208
 msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:208
+#: src/input/pages/basic.cpp:214
 msgid "Change Map View Mode"
 msgstr "更改地图浏览模式"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:214
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr "选择OK"
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr ""
 
@@ -9068,103 +9113,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr "HP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr "SP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr "没有备忘录!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr "你无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr "看起来需要更多金币... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用来使用此项技能!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10383,56 +10428,56 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"."
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr ""
diff --git a/po/zh_HK.po b/po/zh_HK.po
index d0ed4be47..ed91007bd 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-30 15:18+0300\n"
+"POT-Creation-Date: 2016-02-10 19:21+0300\n"
 "PO-Revision-Date: 2016-01-30 09:31+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
-#: src/actions/actions.cpp:164
+#: src/actions/actions.cpp:165
 msgid "File uploaded"
 msgstr "檔案上載成功"
 
@@ -34,15 +34,15 @@ msgstr "檔案上載成功"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:167 src/client.cpp:1506 src/client.cpp:1541
+#: src/actions/actions.cpp:168 src/client.cpp:1506 src/client.cpp:1541
 #: src/gamemodifiers.cpp:451 src/gui/dialogsmanager.cpp:182
 #: src/gui/dialogsmanager.cpp:202 src/gui/widgets/tabs/setup_input.cpp:165
 #: src/gui/widgets/tabs/setup_theme.cpp:314
 #: src/gui/widgets/tabs/setup_theme.cpp:350
-#: src/gui/widgets/tabs/setup_video.cpp:253
-#: src/gui/widgets/tabs/setup_video.cpp:281
-#: src/gui/widgets/tabs/setup_video.cpp:400
-#: src/gui/widgets/tabs/setup_video.cpp:416
+#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_video.cpp:414
 #: src/gui/windows/changeemaildialog.cpp:169
 #: src/gui/windows/changepassworddialog.cpp:159
 #: src/gui/windows/charcreatedialog.cpp:466
@@ -62,46 +62,57 @@ msgstr "確定"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:1041 src/actions/actions.cpp:1054
+#: src/actions/actions.cpp:1042 src/actions/actions.cpp:1055
 msgid "Cache cleaned"
 msgstr "緩存清理成功"
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1211 src/actions/actions.cpp:1217
+#: src/actions/actions.cpp:1212 src/actions/actions.cpp:1218
 #, c-format
 msgid "Client uptime: %s"
 msgstr "客戶端已開啟: %s"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1274 src/actions/actions.cpp:1283
+#: src/actions/actions.cpp:1275 src/actions/actions.cpp:1284
 msgid "Resource images:"
 msgstr "來源影像:"
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1277 src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1278 src/actions/actions.cpp:1288
 msgid "Resource orphaned images:"
 msgstr "來源孤立影像:"
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1378
+#: src/actions/actions.cpp:1379
 msgid "Environment variables dumped"
 msgstr "環境變量轉儲成功"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1491
+#: src/actions/actions.cpp:1492
 msgid "Uploaded config into:"
 msgstr "已把配置上傳至:"
 
 #. TRANSLATORS: upload config chat message
-#: src/actions/actions.cpp:1501
+#: src/actions/actions.cpp:1502
 msgid "Uploaded server config into:"
 msgstr "已把伺服器配置上傳至:"
 
 #. TRANSLATORS: upload log chat message
-#: src/actions/actions.cpp:1511
+#: src/actions/actions.cpp:1512
 msgid "Uploaded log into:"
 msgstr "已把日誌上傳至:"
 
+#. TRANSLATORS: last seen error
+#: src/actions/actions.cpp:1747 src/actions/actions.cpp:1761
+msgid "You not saw this nick."
+msgstr ""
+
+#. TRANSLATORS: last seen message
+#: src/actions/actions.cpp:1753
+#, fuzzy, c-format
+msgid "Last seen for %s: %s"
+msgstr "對 %s 悄悄話：%s"
+
 #. TRANSLATORS: whisper send
 #: src/actions/chat.cpp:258
 msgid "Cannot send empty whispers!"
@@ -270,7 +281,7 @@ msgid "Quick"
 msgstr "快速"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1461
+#: src/actormanager.cpp:1487
 msgid "Visible on map"
 msgstr "在地圖上可見"
 
@@ -289,12 +300,12 @@ msgid "miss"
 msgstr "失誤"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:2244 src/gui/windows/whoisonline.cpp:874
+#: src/being/being.cpp:2248 src/gui/windows/whoisonline.cpp:878
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:2249 src/gui/windows/whoisonline.cpp:879
+#: src/being/being.cpp:2253 src/gui/windows/whoisonline.cpp:883
 msgid "I"
 msgstr "I"
 
@@ -305,53 +316,53 @@ msgid "You were killed by %s."
 msgstr "你已被 %s 殺死."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:857
+#: src/being/localplayer.cpp:861
 msgid "Tried to pick up nonexistent item."
 msgstr "曾試圖拿起不存在的物品."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:861
+#: src/being/localplayer.cpp:865
 msgid "Item is too heavy."
 msgstr "該物品太重."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:865
+#: src/being/localplayer.cpp:869
 msgid "Item is too far away."
 msgstr "該物品太遠."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:869
+#: src/being/localplayer.cpp:873
 msgid "Inventory is full."
 msgstr "背包已滿."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:873
+#: src/being/localplayer.cpp:877
 msgid "Stack is too big."
 msgstr "數目太大."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:877
+#: src/being/localplayer.cpp:881
 msgid "Item belongs to someone else."
 msgstr "該物品屬於其他人."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:881
+#: src/being/localplayer.cpp:885
 msgid "You can't pickup this amount of items."
 msgstr "你不能拿起這個數量的物品."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:885
+#: src/being/localplayer.cpp:889
 msgid "Your item stack has max amount."
 msgstr "你的物品數量已達最大限額."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:892
+#: src/being/localplayer.cpp:896
 msgid "Unknown problem picking up item."
 msgstr "拿起物品時遇到不明錯誤."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:916
+#: src/being/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -359,53 +370,53 @@ msgstr[0] "你拾取了 %d [@@%d|%s@@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1088 src/being/localplayer.cpp:1090
-#: src/being/localplayer.cpp:1116
+#: src/being/localplayer.cpp:1092 src/being/localplayer.cpp:1094
+#: src/being/localplayer.cpp:1120
 msgid "xp"
 msgstr "經驗值"
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1094 src/being/localplayer.cpp:1100
-#: src/being/localplayer.cpp:1106
+#: src/being/localplayer.cpp:1098 src/being/localplayer.cpp:1104
+#: src/being/localplayer.cpp:1110
 msgid "job"
 msgstr "勞動值"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1125
+#: src/being/localplayer.cpp:1129
 msgid "hp"
 msgstr "生命值"
 
 #. TRANSLATORS: get hp message
-#: src/being/localplayer.cpp:1134
+#: src/being/localplayer.cpp:1138
 msgid "mana"
 msgstr "法力值"
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2209
+#: src/being/localplayer.cpp:2213
 #, c-format
 msgid "Follow: %s"
 msgstr "跟隨: %s"
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2215 src/being/localplayer.cpp:2240
+#: src/being/localplayer.cpp:2219 src/being/localplayer.cpp:2244
 msgid "Follow canceled"
 msgstr "已取消跟隨."
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2225
+#: src/being/localplayer.cpp:2229
 #, c-format
 msgid "Imitation: %s"
 msgstr "模仿:%s"
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2231 src/being/localplayer.cpp:2245
+#: src/being/localplayer.cpp:2235 src/being/localplayer.cpp:2249
 msgid "Imitation canceled"
 msgstr "已取消模仿."
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:2595
+#: src/being/localplayer.cpp:2599
 #, c-format
 msgid "You see %s"
 msgstr "你看到 %s"
@@ -415,8 +426,8 @@ msgstr "你看到 %s"
 #. TRANSLATORS: add player to completle ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
-#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
-#: src/gui/popups/popupmenu.cpp:2358
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2318
+#: src/gui/popups/popupmenu.cpp:2360
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -458,7 +469,7 @@ msgstr "性能"
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
 #: src/client.cpp:837 src/dyetool/client.cpp:484
-#: src/gui/widgets/tabs/setup_video.cpp:106
+#: src/gui/widgets/tabs/setup_video.cpp:104
 msgid "Video"
 msgstr "顯示"
 
@@ -505,7 +516,7 @@ msgstr "說明"
 #: src/gui/windows/inventorywindow.cpp:273
 #: src/gui/windows/inventorywindow.cpp:297
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:59
-#: src/gui/windows/npcdialog.cpp:84 src/gui/windows/npcdialog.cpp:126
+#: src/gui/windows/npcdialog.cpp:87 src/gui/windows/npcdialog.cpp:129
 #: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "關閉"
@@ -734,7 +745,6 @@ msgstr "  -O --no-opengl      : 在這次指令禁用OpenGL"
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:351 src/dirs.cpp:366 src/dirs.cpp:411
-#: src/dirs.cpp:584 src/dirs.cpp:592
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在且無法創建!正在退出."
@@ -756,6 +766,12 @@ msgstr "創建更新的目錄時遇到錯誤!"
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "錯誤:%s 不存在且無法創建!正在退出."
 
+#. TRANSLATORS: directory creation error
+#: src/dirs.cpp:584 src/dirs.cpp:592 src/dirs.cpp:600
+#, fuzzy, c-format
+msgid "%s doesn't exist and can't be created!"
+msgstr "%s 不存在且無法創建!正在退出."
+
 #. TRANSLATORS: command line help
 #: src/dyetool/dyemain.cpp:48
 msgid "dyecmd srcfile dyestring dstfile"
@@ -773,36 +789,36 @@ msgstr "dyecmd srcdyestring dstfile"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: chat tab name
-#: src/game.cpp:264 src/gui/windows/chatwindow.cpp:2178
+#: src/game.cpp:266 src/gui/windows/chatwindow.cpp:2193
 msgid "General"
 msgstr "一般"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: long button name for debug window.
 #. TRANSLATORS: debug window name
-#: src/game.cpp:271 src/gui/windowmenu.cpp:175
+#: src/game.cpp:273 src/gui/windowmenu.cpp:175
 #: src/gui/windows/debugwindow.cpp:43
 msgid "Debug"
 msgstr "調試"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:578
+#: src/game.cpp:581
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr "截圖已保存為 %s"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:588
+#: src/game.cpp:591
 msgid "Saving screenshot failed!"
 msgstr "保存截圖失敗!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:675
+#: src/game.cpp:678
 msgid "The connection to the server was lost."
 msgstr "與服務器的連接中斷."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:678
+#: src/game.cpp:681
 msgid "Network Error"
 msgstr "網絡錯誤"
 
@@ -1210,7 +1226,7 @@ msgstr "訊息"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
 msgid "Revive"
 msgstr "復活"
 
@@ -1394,8 +1410,8 @@ msgstr "巨型 (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1984
-#: src/gui/popups/popupmenu.cpp:2062 src/gui/widgets/tabs/socialtabbase.h:46
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:1986
+#: src/gui/popups/popupmenu.cpp:2064 src/gui/widgets/tabs/socialtabbase.h:46
 msgid "(default)"
 msgstr "(默認)"
 
@@ -1727,14 +1743,14 @@ msgstr "選擇隊伍"
 #: src/gui/popups/popupmenu.cpp:735 src/gui/popups/popupmenu.cpp:924
 #: src/gui/popups/popupmenu.cpp:951 src/gui/popups/popupmenu.cpp:987
 #: src/gui/popups/popupmenu.cpp:1713 src/gui/popups/popupmenu.cpp:1752
-#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1852
-#: src/gui/popups/popupmenu.cpp:1893 src/gui/popups/popupmenu.cpp:1963
-#: src/gui/popups/popupmenu.cpp:2041 src/gui/popups/popupmenu.cpp:2075
-#: src/gui/popups/popupmenu.cpp:2104 src/gui/popups/popupmenu.cpp:2125
-#: src/gui/popups/popupmenu.cpp:2146 src/gui/popups/popupmenu.cpp:2172
-#: src/gui/popups/popupmenu.cpp:2190 src/gui/popups/popupmenu.cpp:2220
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2706
-#: src/gui/popups/popupmenu.cpp:2727 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/popups/popupmenu.cpp:1808 src/gui/popups/popupmenu.cpp:1854
+#: src/gui/popups/popupmenu.cpp:1895 src/gui/popups/popupmenu.cpp:1965
+#: src/gui/popups/popupmenu.cpp:2043 src/gui/popups/popupmenu.cpp:2077
+#: src/gui/popups/popupmenu.cpp:2106 src/gui/popups/popupmenu.cpp:2127
+#: src/gui/popups/popupmenu.cpp:2148 src/gui/popups/popupmenu.cpp:2174
+#: src/gui/popups/popupmenu.cpp:2192 src/gui/popups/popupmenu.cpp:2222
+#: src/gui/popups/popupmenu.cpp:2540 src/gui/popups/popupmenu.cpp:2708
+#: src/gui/popups/popupmenu.cpp:2729 src/gui/windows/buyselldialog.cpp:75
 #: src/gui/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1874,11 +1890,11 @@ msgstr "對話"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2390
 #: src/gui/windows/buydialog.cpp:195 src/gui/windows/buydialog.cpp:214
 #: src/gui/windows/buydialog.cpp:285 src/gui/windows/buydialog.cpp:289
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:170
-#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
+#: src/input/pages/basic.cpp:250 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "購買"
 
@@ -1892,10 +1908,10 @@ msgstr "購買"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2402
 #: src/gui/widgets/selldialog.cpp:54 src/gui/widgets/selldialog.cpp:107
 #: src/gui/widgets/selldialog.cpp:145 src/gui/windows/buyselldialog.cpp:73
-#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:250
+#: src/gui/windows/shopwindow.cpp:172 src/input/pages/basic.cpp:256
 #: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "出售"
@@ -1905,7 +1921,7 @@ msgstr "出售"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
 #: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
-#: src/gui/popups/popupmenu.cpp:2498
+#: src/gui/popups/popupmenu.cpp:2500
 msgid "Add comment"
 msgstr "添加評論"
 
@@ -1931,7 +1947,7 @@ msgstr "加至攻擊列表"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2522
 msgid "Add to ignore list"
 msgstr "加至忽略列表"
 
@@ -2015,8 +2031,8 @@ msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
-#: src/gui/popups/popupmenu.cpp:2465
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2443
+#: src/gui/popups/popupmenu.cpp:2467
 msgid "Kick from party"
 msgstr "從隊伍踢出"
 
@@ -2029,7 +2045,7 @@ msgstr "拿起物品"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
 #: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
-#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1840
 msgid "Add to chat"
 msgstr "加至對話"
 
@@ -2044,8 +2060,8 @@ msgstr "地圖物件"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
-#: src/gui/popups/popupmenu.cpp:2071
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2039
+#: src/gui/popups/popupmenu.cpp:2073
 msgid "Remove"
 msgstr "清除"
 
@@ -2053,7 +2069,7 @@ msgstr "清除"
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
 #: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
-#: src/net/eathena/skillrecv.cpp:355
+#: src/net/eathena/skillrecv.cpp:357
 msgid "Warp"
 msgstr "傳送"
 
@@ -2095,7 +2111,7 @@ msgstr "編輯咒語"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:126
 msgid "Clear"
 msgstr "清除"
 
@@ -2148,8 +2164,8 @@ msgstr "離開"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
-#: src/gui/popups/popupmenu.cpp:2186
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2144
+#: src/gui/popups/popupmenu.cpp:2188
 msgid "Copy to clipboard"
 msgstr "複製至剪貼板"
 
@@ -2235,9 +2251,9 @@ msgstr "把 全部 加至交易"
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1616 src/gui/popups/popupmenu.cpp:1790
-#: src/gui/popups/popupmenu.cpp:1833 src/gui/windows/inventorywindow.cpp:268
+#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
 #: src/gui/windows/inventorywindow.cpp:292
-#: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
+#: src/gui/windows/inventorywindow.cpp:905 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
 msgstr "儲存"
 
@@ -2310,9 +2326,9 @@ msgstr "取回 全部"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2594
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:90
+#: src/gui/windows/inventorywindow.cpp:792 src/gui/windows/skilldialog.cpp:90
 #: src/gui/windows/skilldialog.cpp:165 src/gui/windows/skilldialog.cpp:338
 #: src/gui/windows/skilldialog.cpp:513 src/gui/windows/skilldialog.cpp:600
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2320,46 +2336,46 @@ msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1848
+#: src/gui/popups/popupmenu.cpp:1850
 msgid "Clear drop window"
 msgstr "清除掉下視窗"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
+#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
 msgid "Hide"
 msgstr "隱藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
+#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
 msgid "Show"
 msgstr "顯示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1954
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Open yellow bar settings"
 msgstr "開啟黃色欄設定"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1958
 msgid "Reset yellow bar"
 msgstr "重設黃色欄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1960 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
 msgid "Copy to chat"
 msgstr "複製至對話"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
+#: src/gui/popups/popupmenu.cpp:2002 src/gui/popups/popupmenu.cpp:2021
 msgid "Move up"
 msgstr "往上移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
 msgid "Move down"
 msgstr "往下移動"
 
@@ -2367,30 +2383,30 @@ msgstr "往下移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
+#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
 msgid "Undress"
 msgstr "脫衣"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2118
+#: src/gui/popups/popupmenu.cpp:2120
 msgid "Copy"
 msgstr "複製"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2121
+#: src/gui/popups/popupmenu.cpp:2123
 msgid "Paste"
 msgstr "貼上"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2139
+#: src/gui/popups/popupmenu.cpp:2141
 msgid "Open link"
 msgstr "開啟連結"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2157
+#: src/gui/popups/popupmenu.cpp:2159
 msgid "Show window"
 msgstr "顯示視窗"
 
@@ -2398,7 +2414,7 @@ msgstr "顯示視窗"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2211 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
 #: src/gui/windows/ministatuswindow.cpp:360 src/gui/windows/statuswindow.cpp:67
 #: src/gui/windows/statuswindow.cpp:242 src/gui/windows/statuswindow.cpp:364
 #, c-format
@@ -2407,135 +2423,135 @@ msgstr "等級:%d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2216
+#: src/gui/popups/popupmenu.cpp:2218
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
-#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
+#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
+#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
 msgid "Disregard"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
-#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
+#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
+#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
 msgid "Black list"
 msgstr "加至黑名單"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
+#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
 msgid "Set as enemy"
 msgstr "設為冤家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2274 src/gui/popups/popupmenu.cpp:2307
-#: src/gui/popups/popupmenu.cpp:2319 src/gui/popups/popupmenu.cpp:2328
-#: src/gui/popups/popupmenu.cpp:2346
+#: src/gui/popups/popupmenu.cpp:2276 src/gui/popups/popupmenu.cpp:2309
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/popups/popupmenu.cpp:2330
+#: src/gui/popups/popupmenu.cpp:2348
 msgid "Erase"
 msgstr "擦去"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2286
 msgid "Be friend"
 msgstr "設為朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2295 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2325 src/gui/popups/popupmenu.cpp:2334
-#: src/gui/popups/popupmenu.cpp:2352
+#: src/gui/popups/popupmenu.cpp:2297 src/gui/popups/popupmenu.cpp:2315
+#: src/gui/popups/popupmenu.cpp:2327 src/gui/popups/popupmenu.cpp:2336
+#: src/gui/popups/popupmenu.cpp:2354
 msgid "Unignore"
 msgstr "取消忽略"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2371
+#: src/gui/popups/popupmenu.cpp:2373
 msgid "Follow"
 msgstr "跟隨"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2377
 msgid "Imitate"
 msgstr "模仿"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
+#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
 msgid "Buy (?)"
 msgstr "購買 (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
+#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
 msgid "Sell (?)"
 msgstr "出售 (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
+#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
 msgid "Invite to party"
 msgstr "邀請至隊伍"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2483
+#: src/gui/popups/popupmenu.cpp:2485
 #, c-format
 msgid "Join chat %s"
 msgstr "加入對話 %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2492
+#: src/gui/popups/popupmenu.cpp:2494
 msgid "Show Items"
 msgstr "顯示物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2509
+#: src/gui/popups/popupmenu.cpp:2511
 msgid "Remove from pickup list"
 msgstr "從拾起清單中移除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2516
+#: src/gui/popups/popupmenu.cpp:2518
 msgid "Add to pickup list"
 msgstr "加至拾起清單"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2568
+#: src/gui/popups/popupmenu.cpp:2570
 msgid "Unprotect item"
 msgstr "取消保護物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2577
+#: src/gui/popups/popupmenu.cpp:2579
 msgid "Protect item"
 msgstr "保護物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
-#: src/gui/windows/inventorywindow.cpp:909
+#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/windows/inventorywindow.cpp:913
 msgid "Drop..."
 msgstr "丟棄..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2610
+#: src/gui/popups/popupmenu.cpp:2612
 msgid "Drop all"
 msgstr "丟棄全部"
 
@@ -2543,67 +2559,67 @@ msgstr "丟棄全部"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
-#: src/gui/windows/inventorywindow.cpp:914
+#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/windows/inventorywindow.cpp:918
 msgid "Drop"
 msgstr "丟棄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2627
+#: src/gui/popups/popupmenu.cpp:2629
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2635
+#: src/gui/popups/popupmenu.cpp:2637
 msgid "GM commands"
 msgstr "GM命令"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2640
+#: src/gui/popups/popupmenu.cpp:2642
 msgid "Check ip"
 msgstr "檢查IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2643
+#: src/gui/popups/popupmenu.cpp:2645
 msgid "Goto"
 msgstr "到"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2646
+#: src/gui/popups/popupmenu.cpp:2648
 msgid "Recall"
 msgstr "召回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2654
+#: src/gui/popups/popupmenu.cpp:2656
 msgid "Kick"
 msgstr "踢走"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2662 src/gui/popups/popupmenu.cpp:2666
-#: src/gui/popups/popupmenu.cpp:2670 src/gui/popups/popupmenu.cpp:2674
-#: src/gui/popups/popupmenu.cpp:2678
+#: src/gui/popups/popupmenu.cpp:2664 src/gui/popups/popupmenu.cpp:2668
+#: src/gui/popups/popupmenu.cpp:2672 src/gui/popups/popupmenu.cpp:2676
+#: src/gui/popups/popupmenu.cpp:2680
 #, c-format
 msgid "Mute %d"
 msgstr "靜音 %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:2683 src/gui/popups/popupmenu.cpp:2687
-#: src/gui/popups/popupmenu.cpp:2691 src/gui/popups/popupmenu.cpp:2695
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:2685 src/gui/popups/popupmenu.cpp:2689
+#: src/gui/popups/popupmenu.cpp:2693 src/gui/popups/popupmenu.cpp:2697
+#: src/gui/popups/popupmenu.cpp:2701
 #, c-format
 msgid "Unmute %d"
 msgstr "取消靜音 %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2722
+#: src/gui/popups/popupmenu.cpp:2724
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -2670,7 +2686,7 @@ msgstr "聊天"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:60 src/gui/userpalette.cpp:383
 #: src/gui/widgets/tabs/setup_audio.cpp:155
-#: src/gui/widgets/tabs/setup_chat.cpp:290
+#: src/gui/widgets/tabs/setup_chat.cpp:294
 #: src/gui/widgets/tabs/setup_other.cpp:352
 #: src/gui/widgets/tabs/setup_visual.cpp:203
 #: src/gui/windows/registerdialog.cpp:100 src/input/pages/chat.cpp:145
@@ -2957,19 +2973,19 @@ msgstr ""
 #. TRANSLATORS: money label
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:140
-#: src/gui/windows/inventorywindow.cpp:703 src/gui/windows/statuswindow.cpp:69
+#: src/gui/windows/inventorywindow.cpp:707 src/gui/windows/statuswindow.cpp:69
 #: src/gui/windows/statuswindow.cpp:219 src/gui/windows/statuswindow.cpp:331
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
 #. TRANSLATORS: Text under equipped items (should be small)
-#: src/gui/widgets/itemcontainer.cpp:372 src/gui/widgets/itemcontainer.cpp:494
+#: src/gui/widgets/itemcontainer.cpp:371 src/gui/widgets/itemcontainer.cpp:493
 msgid "Eq."
 msgstr ""
 
 #. TRANSLATORS: dialog message
-#: src/gui/widgets/itemlinkhandler.cpp:76
+#: src/gui/widgets/itemlinkhandler.cpp:74
 msgid "Open url"
 msgstr ""
 
@@ -2980,7 +2996,7 @@ msgstr ""
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
 #: src/gui/widgets/selldialog.cpp:107 src/gui/windows/buydialog.cpp:285
-#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:128
+#: src/gui/windows/maileditwindow.cpp:55 src/gui/windows/npcdialog.cpp:131
 #: src/gui/windows/serverdialog.cpp:117 src/gui/windows/shopwindow.cpp:126
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
@@ -2996,7 +3012,7 @@ msgstr "增加"
 #: src/gui/widgets/selldialog.cpp:111 src/gui/windows/buydialog.cpp:297
 #: src/gui/windows/quitdialog.cpp:51 src/gui/windows/quitdialog.cpp:56
 #: src/gui/windows/quitdialog.cpp:58 src/gui/windows/serverdialog.cpp:113
-#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:220
+#: src/gui/windows/textselectdialog.cpp:87 src/input/pages/basic.cpp:226
 msgid "Quit"
 msgstr "離開"
 
@@ -3008,7 +3024,7 @@ msgstr "離開"
 #. TRANSLATORS: status window label (plus sign)
 #: src/gui/widgets/selldialog.cpp:129 src/gui/windows/buydialog.cpp:279
 #: src/gui/windows/itemamountwindow.cpp:190
-#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:119
+#: src/gui/windows/itemamountwindow.cpp:225 src/gui/windows/npcdialog.cpp:122
 #: src/gui/windows/statuswindow.cpp:742
 msgid "+"
 msgstr ""
@@ -3020,7 +3036,7 @@ msgstr ""
 #. TRANSLATORS: npc dialog button
 #: src/gui/widgets/selldialog.cpp:131 src/gui/windows/buydialog.cpp:282
 #: src/gui/windows/itemamountwindow.cpp:188
-#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:121
+#: src/gui/windows/itemamountwindow.cpp:222 src/gui/windows/npcdialog.cpp:124
 msgid "-"
 msgstr ""
 
@@ -3992,30 +4008,35 @@ msgid ""
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
 
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_chat.cpp:279
+msgid "Enable trade spam filter"
+msgstr ""
+
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_chat.cpp:280
+#: src/gui/widgets/tabs/setup_chat.cpp:284
 msgid "Time"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:283
+#: src/gui/widgets/tabs/setup_chat.cpp:287
 msgid "Use local time"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:285
+#: src/gui/widgets/tabs/setup_chat.cpp:289
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:293
+#: src/gui/widgets/tabs/setup_chat.cpp:297
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:295
+#: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
 "Here you can specify some extra words which will also cause highlighting. "
 "Use comma to separate words.\n"
@@ -4024,12 +4045,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:301
+#: src/gui/widgets/tabs/setup_chat.cpp:305
 msgid "Globals ignore names (separated by comma)"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:303
+#: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
 "This setting allows you to ignore some global messages if particular sender "
 "(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
@@ -4038,12 +4059,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:310
+#: src/gui/widgets/tabs/setup_chat.cpp:314
 msgid "Show emotes button in chat"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:312
+#: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
 "If this setting enabled, button will appear near text input field. This "
 "button allows one to invoke composing window, which allows one to insert "
@@ -4054,12 +4075,12 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_chat.cpp:320
+#: src/gui/widgets/tabs/setup_chat.cpp:324
 msgid "Show motd server message on start"
 msgstr ""
 
 #. TRANSLATORS: settings description
-#: src/gui/widgets/tabs/setup_chat.cpp:322
+#: src/gui/widgets/tabs/setup_chat.cpp:326
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
@@ -4527,7 +4548,7 @@ msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:95
+#: src/gui/widgets/tabs/setup_other.cpp:287 src/gui/windows/npcdialog.cpp:98
 msgid "NPC"
 msgstr "NPC"
 
@@ -4906,21 +4927,26 @@ msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:124
-msgid "Use special diagonal speed in players moving"
+msgid "Collect players id and seen log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:128
-msgid "Log players actions (for GM)"
+msgid "Use special diagonal speed in players moving"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:132
-msgid "Create screenshots for each complete trades"
+msgid "Log players actions (for GM)"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:136
+msgid "Create screenshots for each complete trades"
+msgstr ""
+
+#. TRANSLATORS: settings option
+#: src/gui/widgets/tabs/setup_players.cpp:140
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
 msgstr ""
@@ -5058,8 +5084,8 @@ msgstr ""
 #. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_theme.cpp:348
-#: src/gui/widgets/tabs/setup_video.cpp:395
-#: src/gui/widgets/tabs/setup_video.cpp:413
+#: src/gui/widgets/tabs/setup_video.cpp:393
+#: src/gui/widgets/tabs/setup_video.cpp:411
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
@@ -5140,109 +5166,109 @@ msgid "Button %u action"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:73
+#: src/gui/widgets/tabs/setup_video.cpp:71
 msgid "Full screen"
 msgstr "全螢幕"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:76
+#: src/gui/widgets/tabs/setup_video.cpp:74
 msgid "FPS limit:"
 msgstr ""
 
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:81
-#: src/gui/widgets/tabs/setup_video.cpp:121
-#: src/gui/widgets/tabs/setup_video.cpp:325
-#: src/gui/widgets/tabs/setup_video.cpp:469
+#: src/gui/widgets/tabs/setup_video.cpp:79
+#: src/gui/widgets/tabs/setup_video.cpp:119
+#: src/gui/widgets/tabs/setup_video.cpp:323
+#: src/gui/widgets/tabs/setup_video.cpp:467
 msgid "Alt FPS limit: "
 msgstr ""
 
 #. TRANSLATORS: video settings button
-#: src/gui/widgets/tabs/setup_video.cpp:84
+#: src/gui/widgets/tabs/setup_video.cpp:82
 msgid "Detect best mode"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:93
+#: src/gui/widgets/tabs/setup_video.cpp:91
 msgid "Show cursor"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:96
+#: src/gui/widgets/tabs/setup_video.cpp:94
 msgid "Custom cursor"
 msgstr "自訂滑鼠標"
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:100
+#: src/gui/widgets/tabs/setup_video.cpp:98
 msgid "Enable resize"
 msgstr ""
 
 #. TRANSLATORS: video settings checkbox
-#: src/gui/widgets/tabs/setup_video.cpp:103
+#: src/gui/widgets/tabs/setup_video.cpp:101
 msgid "No frame"
 msgstr ""
 
 #. TRANSLATORS: video settings label
 #. TRANSLATORS: video settings label value
 #. TRANSLATORS: video settings label
-#: src/gui/widgets/tabs/setup_video.cpp:118
-#: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:323
-#: src/gui/widgets/tabs/setup_video.cpp:453
-#: src/gui/widgets/tabs/setup_video.cpp:466
+#: src/gui/widgets/tabs/setup_video.cpp:116
+#: src/gui/widgets/tabs/setup_video.cpp:121
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:464
 msgid "None"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:229
+#: src/gui/widgets/tabs/setup_video.cpp:227
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video error message
-#: src/gui/widgets/tabs/setup_video.cpp:236
+#: src/gui/widgets/tabs/setup_video.cpp:234
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:249
+#: src/gui/widgets/tabs/setup_video.cpp:247
 msgid "Switching to Full Screen"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:251
+#: src/gui/widgets/tabs/setup_video.cpp:249
 msgid "Restart needed for changes to take effect."
 msgstr "請重新啟動."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Changing to OpenGL"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:279
+#: src/gui/widgets/tabs/setup_video.cpp:277
 msgid "Applying change to OpenGL requires restart."
 msgstr "確認切換OpenGL需要重新開始."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:364
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Custom resolution (example: 1024x768)"
 msgstr ""
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:366
+#: src/gui/widgets/tabs/setup_video.cpp:364
 msgid "Enter new resolution:                "
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:393
-#: src/gui/widgets/tabs/setup_video.cpp:411
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:409
 msgid "Screen Resolution Changed"
 msgstr ""
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:397
+#: src/gui/widgets/tabs/setup_video.cpp:395
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -6095,25 +6121,36 @@ msgid "Enter password:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:670
+#: src/gui/windows/chatwindow.cpp:672
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/chatwindow.cpp:1116
+#: src/gui/windows/chatwindow.cpp:1118
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "對 %s 悄悄話：%s"
 
+#. TRANSLATORS: prefix for moved message to trade tab.
+#: src/gui/windows/chatwindow.cpp:1550
+#, fuzzy
+msgid "Moved: "
+msgstr "移動"
+
+#. TRANSLATORS: moved message to trade tab warning.
+#: src/gui/windows/chatwindow.cpp:1558
+msgid "Your message was moved to trade tab"
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/gui/windows/chatwindow.cpp:1571
+#: src/gui/windows/chatwindow.cpp:1583
 msgid "Broken nick detected: "
 msgstr ""
 
 #. TRANSLATORS: owners pet name. For example: 4144's pet
 #. TRANSLATORS: user's pet
-#: src/gui/windows/chatwindow.cpp:1740 src/net/eathena/petrecv.cpp:68
+#: src/gui/windows/chatwindow.cpp:1752 src/net/eathena/petrecv.cpp:68
 #, c-format
 msgid "%s's pet"
 msgstr ""
@@ -6276,12 +6313,12 @@ msgid "E"
 msgstr ""
 
 #. TRANSLATORS: question dialog title
-#: src/gui/windows/inventorywindow.cpp:1050
+#: src/gui/windows/inventorywindow.cpp:1054
 msgid "Insert card request"
 msgstr ""
 
 #. TRANSLATORS: question dialog message
-#: src/gui/windows/inventorywindow.cpp:1052
+#: src/gui/windows/inventorywindow.cpp:1056
 #, c-format
 msgid "Insert %s into %s?"
 msgstr ""
@@ -6485,7 +6522,7 @@ msgid "Update host: %s"
 msgstr ""
 
 #. TRANSLATORS: question dialog
-#: src/gui/windows/logindialog.cpp:238
+#: src/gui/windows/logindialog.cpp:241
 msgid "Open register url"
 msgstr ""
 
@@ -6645,22 +6682,22 @@ msgid "Job level: %d"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:80
+#: src/gui/windows/npcdialog.cpp:83
 msgid "Stop waiting"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:82
+#: src/gui/windows/npcdialog.cpp:85
 msgid "Next"
 msgstr "繼續"
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:86
+#: src/gui/windows/npcdialog.cpp:89
 msgid "Submit"
 msgstr ""
 
 #. TRANSLATORS: npc dialog button
-#: src/gui/windows/npcdialog.cpp:130
+#: src/gui/windows/npcdialog.cpp:133
 msgid "Reset"
 msgstr ""
 
@@ -6828,7 +6865,7 @@ msgid "Reset Windows"
 msgstr "重置視窗"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1121
+#: src/gui/windows/shopwindow.cpp:104 src/gui/windows/shopwindow.cpp:1105
 msgid "Personal Shop"
 msgstr ""
 
@@ -6860,40 +6897,40 @@ msgid "Unpublish"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:917
+#: src/gui/windows/shopwindow.cpp:911
 msgid "error: player busy"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:959
+#: src/gui/windows/shopwindow.cpp:953
 msgid "error: Can't sell this item"
 msgstr ""
 
 #. TRANSLATORS: error buy/sell shop request
-#: src/gui/windows/shopwindow.cpp:971
+#: src/gui/windows/shopwindow.cpp:965
 msgid "error: Can't buy this item"
 msgstr ""
 
 #. TRANSLATORS: buy shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:991
+#: src/gui/windows/shopwindow.cpp:985
 #, c-format
 msgid "%s wants to buy %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: sell shop request (nick, item)
-#: src/gui/windows/shopwindow.cpp:998
+#: src/gui/windows/shopwindow.cpp:992
 #, c-format
 msgid "%s wants to sell %s do you accept?"
 msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:1005 src/net/ea/traderecv.cpp:163
+#: src/gui/windows/shopwindow.cpp:999 src/net/ea/traderecv.cpp:163
 msgid "Request for Trade"
 msgstr ""
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1126
+#: src/gui/windows/shopwindow.cpp:1110
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6928,13 +6965,13 @@ msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:809
+#: src/gui/windows/skilldialog.cpp:807
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:812
+#: src/gui/windows/skilldialog.cpp:810
 msgid "Text: "
 msgstr ""
 
@@ -7255,7 +7292,7 @@ msgid "Completed"
 msgstr "已完成"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:648
+#: src/gui/windows/whoisonline.cpp:91 src/gui/windows/whoisonline.cpp:650
 msgid "Who Is Online - Updating"
 msgstr ""
 
@@ -7270,12 +7307,12 @@ msgid "Who Is Online - "
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:664
+#: src/gui/windows/whoisonline.cpp:666
 msgid "Who Is Online - error"
 msgstr ""
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:708
+#: src/gui/windows/whoisonline.cpp:712
 msgid "Who Is Online - Update"
 msgstr ""
 
@@ -7297,25 +7334,25 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:384 src/input/inputmanager.cpp:429
+#: src/input/inputmanager.cpp:385 src/input/inputmanager.cpp:430
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:404
+#: src/input/inputmanager.cpp:405
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:435
+#: src/input/inputmanager.cpp:436
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7323,7 +7360,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:449 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:450 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -7404,91 +7441,96 @@ msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:136
-msgid "Change targeting type"
+msgid "Target skill unit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:142
-msgid "Target pet"
+msgid "Change targeting type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:148
-msgid "Catch pet"
+msgid "Target pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:154
-msgid "Other Keys"
+msgid "Catch pet"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:160
-msgid "Pickup"
+msgid "Other Keys"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:166
-msgid "Change Pickup Type"
+msgid "Pickup"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:172
-msgid "Sit"
+msgid "Change Pickup Type"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:178
-msgid "Screenshot"
+msgid "Sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:184
-msgid "Enable/Disable Trading"
+msgid "Screenshot"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:190
-msgid "Open trade window"
+msgid "Enable/Disable Trading"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:196
-msgid "Start trade with target"
+msgid "Open trade window"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:202
-msgid "Follow selected player"
+msgid "Start trade with target"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:208
-msgid "Change Map View Mode"
+msgid "Follow selected player"
 msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/basic.cpp:214
+msgid "Change Map View Mode"
+msgstr ""
+
+#. TRANSLATORS: input action name
+#: src/input/pages/basic.cpp:220
 msgid "Select OK"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:226
+#: src/input/pages/basic.cpp:232
 msgid "Stop or sit"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:232
+#: src/input/pages/basic.cpp:238
 msgid "Return to safe video mode"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:238
+#: src/input/pages/basic.cpp:244
 msgid "Fire your homunculus"
 msgstr ""
 
 #. TRANSLATORS: input action name
-#: src/input/pages/basic.cpp:256
+#: src/input/pages/basic.cpp:262
 msgid "Open context menu"
 msgstr ""
 
@@ -9060,103 +9102,103 @@ msgid "hungry level %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:229
+#: src/net/eathena/skillrecv.cpp:231
 #, c-format
 msgid "Unknown skill error: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:242
+#: src/net/eathena/skillrecv.cpp:244
 #, c-format
 msgid "Unknown skill error: %d."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:251 src/net/tmwa/skillrecv.cpp:146
+#: src/net/eathena/skillrecv.cpp:253 src/net/tmwa/skillrecv.cpp:146
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:255 src/net/tmwa/skillrecv.cpp:150
+#: src/net/eathena/skillrecv.cpp:257 src/net/tmwa/skillrecv.cpp:150
 msgid "Insufficient HP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:259 src/net/tmwa/skillrecv.cpp:154
+#: src/net/eathena/skillrecv.cpp:261 src/net/tmwa/skillrecv.cpp:154
 msgid "Insufficient SP!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:263 src/net/tmwa/skillrecv.cpp:158
+#: src/net/eathena/skillrecv.cpp:265 src/net/tmwa/skillrecv.cpp:158
 msgid "You have no memos!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:267 src/net/tmwa/skillrecv.cpp:162
+#: src/net/eathena/skillrecv.cpp:269 src/net/tmwa/skillrecv.cpp:162
 msgid "You cannot do that right now!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:271 src/net/tmwa/skillrecv.cpp:166
+#: src/net/eathena/skillrecv.cpp:273 src/net/tmwa/skillrecv.cpp:166
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:275 src/net/tmwa/skillrecv.cpp:170
+#: src/net/eathena/skillrecv.cpp:277 src/net/tmwa/skillrecv.cpp:170
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:280 src/net/tmwa/skillrecv.cpp:175
+#: src/net/eathena/skillrecv.cpp:282 src/net/tmwa/skillrecv.cpp:175
 msgid "You need another red gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:284 src/net/tmwa/skillrecv.cpp:179
+#: src/net/eathena/skillrecv.cpp:286 src/net/tmwa/skillrecv.cpp:179
 msgid "You need another blue gem!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:288 src/net/tmwa/skillrecv.cpp:183
+#: src/net/eathena/skillrecv.cpp:290 src/net/tmwa/skillrecv.cpp:183
 msgid "You're carrying to much to do this!"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:292
+#: src/net/eathena/skillrecv.cpp:294
 msgid "Fail summon."
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillrecv.cpp:296
+#: src/net/eathena/skillrecv.cpp:298
 msgid "Need spirits."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:306
+#: src/net/eathena/skillrecv.cpp:308
 #, c-format
 msgid "Need equipment %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:312
+#: src/net/eathena/skillrecv.cpp:314
 #, c-format
 msgid "Need equipment %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:326
+#: src/net/eathena/skillrecv.cpp:328
 #, c-format
 msgid "Need item %s."
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/net/eathena/skillrecv.cpp:332
+#: src/net/eathena/skillrecv.cpp:334
 #, c-format
 msgid "Need item %s and amount %d"
 msgstr ""
 
 #. TRANSLATORS: warp select window name
-#: src/net/eathena/skillrecv.cpp:353
+#: src/net/eathena/skillrecv.cpp:355
 msgid "Select warp target"
 msgstr ""
 
@@ -10375,56 +10417,56 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d week"
 msgstr "%d 星期"
 
-#: src/utils/stringutils.cpp:920
+#: src/utils/stringutils.cpp:946
 #, c-format
 msgid "%d weeks"
 msgstr "%d 星期"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d day"
 msgstr "%d 日"
 
-#: src/utils/stringutils.cpp:931
+#: src/utils/stringutils.cpp:957
 #, c-format
 msgid "%d days"
 msgstr "%d 日"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hour"
 msgstr "%d 小時"
 
-#: src/utils/stringutils.cpp:941
+#: src/utils/stringutils.cpp:967
 #, c-format
 msgid "%d hours"
 msgstr "%d 小時"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minute"
 msgstr "%d 分鐘"
 
-#: src/utils/stringutils.cpp:951
+#: src/utils/stringutils.cpp:977
 #, c-format
 msgid "%d minutes"
 msgstr "%d 分鐘"
 
 #. TRANSLATORS: uptime command
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d second"
 msgstr "%d 秒"
 
-#: src/utils/stringutils.cpp:961 src/utils/stringutils.cpp:967
+#: src/utils/stringutils.cpp:987 src/utils/stringutils.cpp:993
 #, c-format
 msgid "%d seconds"
 msgstr "%d 秒"
author	Andrei Karas <akaras@inbox.ru>	2016-02-10 19:35:56 +0300
committer	Andrei Karas <akaras@inbox.ru>	2016-02-10 19:35:56 +0300
commit	dde9d0d8a9b803ed5e78797ebb5ab0db5fddf662 (patch)
tree	1dd9bb3acb840667636bcd678ceced0d8aead7d4 /po
parent	c10177d08a6185431559bea19a296f2f7934340e (diff)
download	plus-dde9d0d8a9b803ed5e78797ebb5ab0db5fddf662.tar.gz plus-dde9d0d8a9b803ed5e78797ebb5ab0db5fddf662.tar.bz2 plus-dde9d0d8a9b803ed5e78797ebb5ab0db5fddf662.tar.xz plus-dde9d0d8a9b803ed5e78797ebb5ab0db5fddf662.zip