23 files changed, 5486 insertions, 5561 deletions

diff --git a/po/ca.po b/po/ca.po
index 6154f5a22..42f234074 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
 "ca/)\n"
@@ -130,7 +130,7 @@ msgstr "Falta el nom del gremi."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Si us plau especifica un nom."
 
@@ -160,91 +160,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "El jugador ja és %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Relació canviada amb èxit, el jugador es ara %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "El jugador no pot ser %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "El jugador no estava ignorat!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "El jugador ja no està ignorat!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "El jugador no pot ser des-ignorat!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Personatge ja esborrat!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "El personatge no pot ser esborrat!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "amic"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "desatès"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -417,8 +417,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "Ignorar completament"
 
@@ -502,13 +502,13 @@ msgstr "Ajuda"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Tancar"
 
@@ -1212,7 +1212,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr ""
 
@@ -1396,8 +1396,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr ""
 
@@ -1722,21 +1722,21 @@ msgstr "Crear grup"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1771,7 +1771,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1786,8 +1786,8 @@ msgstr "Intercanvi"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1799,41 +1799,41 @@ msgstr "Atacar"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
@@ -1850,9 +1850,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Moure"
@@ -1861,8 +1861,8 @@ msgstr "Moure"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Parlar"
 
@@ -1876,11 +1876,11 @@ msgstr "Parlar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1894,11 +1894,11 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Vendre"
 
@@ -1906,26 +1906,26 @@ msgstr "Vendre"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr ""
 
@@ -1933,19 +1933,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr ""
 
@@ -1953,19 +1953,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr ""
 
@@ -1973,7 +1973,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1990,14 +1990,14 @@ msgstr "Des-equipar"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr ""
 
@@ -2005,38 +2005,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Jugadors"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Afegir al xat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "Element del mapa"
 
@@ -2046,22 +2046,22 @@ msgstr "Element del mapa"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr ""
 
@@ -2070,7 +2070,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2078,69 +2078,69 @@ msgstr "Conjunt"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Conjurs"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Netejar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "Desactivar ressaltat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "Activa resaltat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "Borrar nom"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "Habilitar absència"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "Des-habilita absència"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Deixa"
 
@@ -2150,84 +2150,84 @@ msgstr "Deixa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "Canviar la posició del gremi"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "Canviar el nom de la marca de mapa "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "Nom:                     "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr "Afegeix al intercanvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr "Agregar-ne 10 al intercanvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr "Agregar-ne la mitat al intercanvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr "Agregar-los tots al intercanvi"
 
@@ -2236,8 +2236,8 @@ msgstr "Agregar-los tots al intercanvi"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2245,64 +2245,63 @@ msgstr "Botiga"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "Emmagatzema 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Emmagatzema la mitat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Emmagatzema-ho tot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "Mou-te al Objectiu"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Recuperar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Recupera 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Recuperar la mitat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Recupera-ho tot"
 
@@ -2313,56 +2312,56 @@ msgstr "Recupera-ho tot"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "Utilitzar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "Amagar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr ""
 
@@ -2370,30 +2369,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr ""
 
@@ -2401,7 +2400,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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 +2409,135 @@ msgstr "Nivell: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 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:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Deixar caure..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr ""
 
@@ -2546,70 +2545,70 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Deixar caure"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "Mou-te al Objectiu"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3055,7 +3054,7 @@ msgstr "Editar"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivell: %d"
@@ -3126,30 +3125,30 @@ msgid "Battle"
 msgstr "Batalla"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Anunci global:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Anunci global de %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s xiuxiueigs: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4174,7 +4173,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr ""
 
@@ -5581,7 +5580,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
@@ -5667,7 +5666,7 @@ msgstr "HAB"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Habilitats"
 
@@ -6911,42 +6910,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "Aumentar"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Punts d'habilitat restants: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilitats %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Habilitat %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -7637,9 +7636,9 @@ msgstr ""
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "Drecera del objecte  %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9042,7 +9041,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "Objecte desconegut"
 
@@ -9313,157 +9312,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sense nom"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index c2c9ea7de..2ce01563a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
 "cs/)\n"
@@ -134,7 +134,7 @@ msgstr "Chybí jméno gildy."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Prosím zadej jméno."
 
@@ -164,91 +164,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Hráč je již %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Hráč byl úspěšně zařazen jako %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Hráč nemůže být zařazen jako %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Hráč nebyl ignorován!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Hráč již není ignorován!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Hráč nemůže být odignorován!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Hráč již byl vymazán!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Hráč již není smazán!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Hráč nemůže být vymazán!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "přítel"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "přehlížený"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutrální"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "na černé listině"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "nepřítel"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -422,8 +422,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "Kompletně ignorovat"
 
@@ -507,13 +507,13 @@ msgstr "Nápověda"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zavřít"
 
@@ -1218,7 +1218,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:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr "Oživ"
 
@@ -1403,8 +1403,8 @@ msgstr "Maximální (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(výchozí)"
 
@@ -1729,21 +1729,21 @@ msgstr "Vytvořit partu"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1778,7 +1778,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1793,8 +1793,8 @@ msgstr "Obchod"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1806,41 +1806,41 @@ msgstr "Útok"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "Šeptat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "Vyléčit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "Vykopnout z gildy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "Změnit pozici v gildě"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "Pozvat do gildy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Vyhladit"
 
@@ -1857,9 +1857,9 @@ msgstr "Vyhladit"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Jdi sem"
@@ -1868,8 +1868,8 @@ msgstr "Jdi sem"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Promluv"
 
@@ -1883,11 +1883,11 @@ msgstr "Promluv"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Nákup"
 
@@ -1901,11 +1901,11 @@ msgstr "Nákup"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Prodej"
 
@@ -1913,26 +1913,26 @@ msgstr "Prodej"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr "Přidat komentář"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "Vyřadit ze seznamu útoku"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "Přidat do prioritního seznamu útoku"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "Přidat do seznamu útoku"
 
@@ -1940,19 +1940,19 @@ 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:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "Vložit do seznamu ignorovaných"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr "Přesunout k veliteli"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr "Oheň"
 
@@ -1960,19 +1960,19 @@ msgstr "Oheň"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr "Nakrmit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr "Zabít"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr "Upustit kořist"
 
@@ -1980,7 +1980,7 @@ msgstr "Upustit kořist"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1997,14 +1997,14 @@ msgstr "Odebrat z vybavení"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Přejmenovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr "Vrátit k vejci"
 
@@ -2012,38 +2012,38 @@ msgstr "Vrátit k vejci"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "Vložit jméno do chatu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Hráči"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "Vykopnout z party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "Sebrat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Přidat do chatu"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "Označit na mapě"
 
@@ -2053,22 +2053,22 @@ msgstr "Označit na mapě"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "Odebrat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Přesun"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr "Přesunout kameru"
 
@@ -2077,7 +2077,7 @@ msgstr "Přesunout kameru"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2085,69 +2085,69 @@ msgstr "Výstroje"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr "Vyčistit výstroj"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Kouzla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr "Upravit kouzlo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Vymazat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "Vypnout zvýrazňování"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "Zapnout zvýrazňování"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr "Neodebírat jméno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "Odebrat jméno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "Zapnout \"away\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "Vypnout \"away\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Opustit"
 
@@ -2157,84 +2157,84 @@ msgstr "Opustit"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr "Kopírovat do schránky"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "Změň hodnost v guildě"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr "okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr "Odemknout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr "Zamknout"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "Přejmenovat značku na mapě "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "Jméno:                   "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Hráčův komentář           "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Komentář:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr "Přidat k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr "Přidat 10 k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr "Přidat polovinu k obchodu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr "Vlož do obchodu vše-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr "Přidat vše k obchodu"
 
@@ -2243,8 +2243,8 @@ msgstr "Přidat vše k obchodu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2252,64 +2252,63 @@ msgstr "Uložit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "Uschovat 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Uschovat polovinu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr "Ulož vše-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Uschovat všechny"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "Přesunout k veliteli"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Vzít"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Vzít 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Vzít polovinu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr "Vyber vše-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Vzít všechny"
 
@@ -2320,56 +2319,56 @@ msgstr "Vzít všechny"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "Použít"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr "Vyčistit okno upuštění"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "Skrýt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "Zobrazit"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 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:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "Posunout nahoru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr "Posunout dolů"
 
@@ -2377,30 +2376,30 @@ msgstr "Posunout dolů"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr "Svléknout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr "Kopírovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr "Vložit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr "Otevřít odkaz"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr "Zobrazit okno"
 
@@ -2408,7 +2407,7 @@ msgstr "Zobrazit okno"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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 +2416,135 @@ msgstr "Úroveň: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 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:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 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:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr "Černá listina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr "Nastavit jako nepřítele"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr "Vymazat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "Být přátelé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "Odignorovat"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "Následovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "Koupit (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "Prodat (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "Pozvat do party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr "Připojit k chatu %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "Zobrazit předměty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr "Odeber ze seznamu sběru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 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:2570
+#: src/gui/popups/popupmenu.cpp:2568
 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:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr "Chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Upustit..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "Upustit vše"
 
@@ -2553,70 +2552,70 @@ msgstr "Upustit vše"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Upustit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr "GM příkazy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr "Zkontrolovat ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr "Jdi na"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr "Zavolej zpět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr "Vykopnout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "Přesunout k veliteli"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3062,7 +3061,7 @@ msgstr "Upravit"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Úroveň: %d"
@@ -3133,30 +3132,30 @@ msgid "Battle"
 msgstr "Boje"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Globální oznámení:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globální oznámení od %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s šeptá: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr "%s je nyní připojen."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s se právě odpojil."
@@ -4181,7 +4180,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr "neznámý"
 
@@ -5593,7 +5592,7 @@ msgstr "ÚK"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Úkoly"
 
@@ -5679,7 +5678,7 @@ msgstr "DOV"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Dovednosti"
 
@@ -6930,42 +6929,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "Zvýšit"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Dovednostních bodů: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Dovednost nastavena %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Dovednost %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Neúspěšná dovednost: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -7654,9 +7653,9 @@ msgstr "Zobrazit smajlíky"
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "Zkratka výbavy %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9065,7 +9064,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "Neznámý předmět"
 
@@ -9336,157 +9335,157 @@ msgstr "Moderní OpenGL"
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "nepojmenovaný"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr "Útok %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr "Kritický útok %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr "Magický útok %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr "Obrana %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr "Kritická obrana %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr "Magiská obrana %s"
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr "BŽ %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr "BM %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr "Úroveň %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr "Rychlost %s"
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr "Dosah %s"
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr "Útěk %s"
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr "mazlíček"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""
 
@@ -10465,6 +10464,3 @@ msgstr "%d vteřinu"
 #, c-format
 msgid "%d seconds"
 msgstr "%d vteřin"
-
-#~ msgid "Client too old."
-#~ msgstr "Klientský software je příliš starý."
diff --git a/po/de.po b/po/de.po
index 38dbf8316..f62f3249e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -34,8 +34,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
 "de/)\n"
@@ -156,7 +156,7 @@ msgstr "Name der Gilde fehlt."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Bitte gib einen Namen an."
 
@@ -186,91 +186,91 @@ msgid "equipped hat %s."
 msgstr "Hut %s angezogen."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Spieler ist bereits %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Spieler erfolgreich %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Spieler konnte nicht %s werden!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Spieler wurde nicht ignoriert!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Spieler wird nicht länger ignoriert!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Spieler ist bereits gelöscht!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Spieler ist nicht mehr gelöscht!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Spieler konnte nicht gelöscht werden!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "Freund"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "missachtet"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "Schwarze Liste"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "Feind"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr "Schnellnachricht"
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr "Konfigurationswert: %s"
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr "Konfigurationswert des Servers: %s"
@@ -443,8 +443,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "Komplett ignorieren"
 
@@ -528,13 +528,13 @@ msgstr "Hilfe"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Schließen"
 
@@ -1243,7 +1243,7 @@ msgstr "Nachricht"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr "Wiederbeleben"
 
@@ -1431,8 +1431,8 @@ msgstr "Riesig (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(Normal)"
 
@@ -1757,21 +1757,21 @@ msgstr "Gruppe erstellen"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1806,7 +1806,7 @@ msgstr "Karten: "
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1821,8 +1821,8 @@ msgstr "Handeln"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1834,41 +1834,41 @@ msgstr "Angriff"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "Flüstern"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "Heilen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "Aus Gilde werfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "Rang in Gilde ändern"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "In Gilde einladen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Atombombe"
 
@@ -1885,9 +1885,9 @@ msgstr "Atombombe"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Bewegen"
@@ -1896,8 +1896,8 @@ msgstr "Bewegen"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Sprechen"
 
@@ -1911,11 +1911,11 @@ msgstr "Sprechen"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Kaufen"
 
@@ -1929,11 +1929,11 @@ msgstr "Kaufen"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Verkaufen"
 
@@ -1941,26 +1941,26 @@ msgstr "Verkaufen"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr "Kommentar hinzufügen"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "Aus Angriffsliste entfernen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "Zur bevorzugten Angriffsliste hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "Zur Angriffsliste hinzufügen"
 
@@ -1968,19 +1968,19 @@ 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:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "Zur Ignorierenliste hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr "Zum Meister bewegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr "Feuern"
 
@@ -1988,19 +1988,19 @@ msgstr "Feuern"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr "Füttern"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr "Töten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr "Beute wegwerfen"
 
@@ -2008,7 +2008,7 @@ msgstr "Beute wegwerfen"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -2025,14 +2025,14 @@ msgstr "Ablegen"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Umbenennen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr "Zum Ei zurückkehren"
 
@@ -2040,38 +2040,38 @@ msgstr "Zum Ei zurückkehren"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "Name zum Chat hinzufügen"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Spieler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "Aus Gruppe werfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "Aufheben"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Zum Chat hinzufügen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "Kartengegenstand"
 
@@ -2081,22 +2081,22 @@ msgstr "Kartengegenstand"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "Entfernen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Teleport"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr "Kamera bewegen"
 
@@ -2105,7 +2105,7 @@ msgstr "Kamera bewegen"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2113,69 +2113,69 @@ msgstr "Ausrüstungset"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr "Ausrüstungset leeren"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Zaubersprüche"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr "Zauberspruch bearbeiten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Leeren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "Hervorhebung abschalten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "Hervorhebung einschalten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr "Namen nicht löschen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "Namen löschen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "Abwesendheitsmodus aktvieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "Abwesendheitsmodus deaktiveren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Verlassen"
 
@@ -2185,84 +2185,84 @@ msgstr "Verlassen"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage kopieren"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "Position der Gilde ändern"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr "Fenster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr "Entsperren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr "Sperren"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "Kartenzeichen umbenennen "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "Name:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Spieler Kommentar         "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Kommentar:                 "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr "Zum Handeln hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr "10 zum Handeln hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr "Die Hälfte zum Handeln hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr "Alles -1 zum Handel hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr "Alles zum Handeln hinzufügen"
 
@@ -2271,8 +2271,8 @@ msgstr "Alles zum Handeln hinzufügen"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2280,64 +2280,63 @@ msgstr "Aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "10 aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Hälfte aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr "Alles -1 ablegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Alles aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "Zum Meister bewegen"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "10 abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Hälfte abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr "Alles -1 aufnehmen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Alles abholen"
 
@@ -2348,56 +2347,56 @@ msgstr "Alles abholen"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "Benutzen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr "Fenster: Wegwerfen leeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "Verstecke"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "Zeige"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr "Einstellungen des gelben Balkens öffnen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 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:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "Nach oben bewegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr "Nach unten bewegen"
 
@@ -2405,30 +2404,30 @@ msgstr "Nach unten bewegen"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr "Ausziehen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr "Kopieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr "Einfügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr "Link öffnen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr "Fenster anzeigen"
 
@@ -2436,7 +2435,7 @@ msgstr "Fenster anzeigen"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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
@@ -2445,135 +2444,135 @@ msgstr "Stufe: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr "Max Level"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 msgid "Disregard"
 msgstr "Missachten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 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:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr "Schwarze Liste"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr "Als Feind setzen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr "Löschen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "Befreunden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "Nicht mehr Ignorieren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "Folgen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr "Imitieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "Kaufen (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "Verkaufen (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "Zu Gruppe einladen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr "Chat beitreten %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "Gegenstände anzeigen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr "Von der Aufhebeliste entfernen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 msgid "Add to pickup list"
 msgstr "Zur Aufhebeliste hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr "Gegenstand nicht mehr schützen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr "Gegenstand schützen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Wegwerfen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "Alles wegwerfen"
 
@@ -2581,70 +2580,70 @@ msgstr "Alles wegwerfen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Wegwerfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr "GM...."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr "GM Befehle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr "IP überprüfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr "Gehe zu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr "Zurückrufen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr "Rauswerfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr "Stummschalten %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, 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:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "Zum Meister bewegen"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3090,7 +3089,7 @@ msgstr "Ändern"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -3161,30 +3160,30 @@ msgid "Battle"
 msgstr "Kampf"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Globale Ansage:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globale Ansage von %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s flüstert: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr "%s ist jetzt Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s ist jetzt Offline."
@@ -4343,7 +4342,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr "unbekannt"
 
@@ -5762,7 +5761,7 @@ msgstr "QE"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Quests"
 
@@ -5848,7 +5847,7 @@ msgstr "FÄH"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Fähigkeiten"
 
@@ -7097,42 +7096,42 @@ msgid "Personal Shop - %s"
 msgstr "Persönlicher Stand - %s"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "Hoch"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Fähigkeitspunkte verfügbar: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Fähigkeitenset %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Fähigkeit %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Fähigkeit fehlgeschlagen: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, 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:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr "Text: "
 
@@ -7823,9 +7822,9 @@ msgstr "Smilies anzeigen"
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "Ausrüstungset Kurzbefehl %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9235,7 +9234,7 @@ msgstr "Verbleibend %s Vermietungszeit für Gegenstand %s."
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "Unbekannter Gegenstand"
 
@@ -9506,157 +9505,157 @@ msgstr "Modernes OpenGL"
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "Unbenannt"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr "Angriff %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr "Min Angriff %s"
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr "Max Angriff %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr "Kritscher Angriff %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr "M. Angriff %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr "Verteidigung %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr "Min Verteidigung %s"
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr "Max Verteidigung %s"
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr "Kritsche Verteidigung %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr "M. Verteidigung %s"
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr "Min M. Verteidigung %s"
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr "Max M. Verteidigung %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr "HP %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr "Max HP %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr "MP %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr "Max MP %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr "Level %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr "Geschwindigkeit %s"
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr "Reichweite %s"
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr "Flucht %s"
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr "Min Flucht %s"
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr "Max Flucht %s"
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr "Kartenslots %s"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr "Haustier"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr "Fähigkeit"
 
@@ -10653,6 +10652,3 @@ msgstr "%d Sekunden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
-
-#~ msgid "Client too old."
-#~ msgstr "Client ist zu alt."
diff --git a/po/es.po b/po/es.po
index 8588a2ec6..1e06070c3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-22 12:35+0000\n"
-"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\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"
 "Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
 "es/)\n"
 "Language: es\n"
@@ -142,7 +142,7 @@ msgstr "Falta el nombre del gremio."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Por favor, especifique un nombre."
 
@@ -172,91 +172,91 @@ msgid "equipped hat %s."
 msgstr "tiene puesto el sombrero %s."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "¡Jugador ya es %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "¡Relación cambiada exitosamente! ¡El jugador ahora es %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "¡Jugador no pudo ser %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "¡El jugador no fue ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "¡El jugador ya no es ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "¡Al jugador no se le puede dejar de ignorar!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "¡Jugador ya borrado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "¡El jugador ya no se encuentra borrado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "¡Jugador no pudo ser borrado!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "amigo"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "desatendido"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "en la lista negra"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "enemigo"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr "Mensaje rápido"
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr "Valor de configuración: %s"
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr "Valor de configuración del servidor: %s"
@@ -429,8 +429,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -514,13 +514,13 @@ msgstr "Ayuda"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Cerrar"
 
@@ -1227,7 +1227,7 @@ msgstr "Mensaje"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr "Revivir"
 
@@ -1414,8 +1414,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(predeterminado)"
 
@@ -1740,21 +1740,21 @@ msgstr "Crear grupo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1789,7 +1789,7 @@ msgstr "Tarjetas: "
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1804,8 +1804,8 @@ msgstr "Intercambio"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1817,41 +1817,41 @@ msgstr "Atacar"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "Susurrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "Curar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "Expulsar del gremio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "Cambiar posición en el gremio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "Invitar al gremio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Eliminar"
 
@@ -1868,9 +1868,9 @@ msgstr "Eliminar"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Mover"
@@ -1879,8 +1879,8 @@ msgstr "Mover"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Hablar"
 
@@ -1894,11 +1894,11 @@ msgstr "Hablar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1912,11 +1912,11 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Vender"
 
@@ -1924,26 +1924,26 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr "Agregar comentario"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "Remover de la lista de ataque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "Añadir a la lista de ataque prioritario"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "Agregar a la lista de ataque"
 
@@ -1951,19 +1951,19 @@ 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:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "Agregar a la lista de ignorados"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr "Moverse al maestro"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr "Fuego"
 
@@ -1971,19 +1971,19 @@ msgstr "Fuego"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr "Alimentar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr "Matar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr "Soltar botín"
 
@@ -1991,7 +1991,7 @@ msgstr "Soltar botín"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -2008,14 +2008,14 @@ msgstr "Quitárselo"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Renombrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr "Regresar al huevo"
 
@@ -2023,38 +2023,38 @@ msgstr "Regresar al huevo"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "Agregar nombre al chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Jugadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "Expulsar del grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "Recoger"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "Mapa Objeto"
 
@@ -2064,22 +2064,22 @@ msgstr "Mapa Objeto"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "Quitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Saltar a"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr "Mover cámara"
 
@@ -2088,7 +2088,7 @@ msgstr "Mover cámara"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2096,69 +2096,69 @@ msgstr "Vestimenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr "Limpiar vestimenta"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Hechizos"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr "Editar hechizo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Limpiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "Deshabilitar resaltado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "Habilitar resaltado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr "No remover nombre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "Remover nombre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "Habilitar ausencia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "Deshabilitar ausencia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Dejar"
 
@@ -2168,84 +2168,84 @@ msgstr "Dejar"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "Cambiar posición del gremio"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr "ventana"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr "Desbloquear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr "Bloquear"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "Renombrar señal del mapa "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "Nombre:                  "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Comentario del jugador    "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Comentario:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr "Agregar al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr "Agregar 10 al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr "Agregar la mitad al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr "Agregar el intercambio todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
@@ -2254,8 +2254,8 @@ msgstr "Agregar todo al intercambio"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2263,64 +2263,63 @@ msgstr "Almacenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "Almacenar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr "Almacenar todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Almacenar todo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "Moverse al maestro"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Recuperar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Recuperar la mitad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr "Recuperar todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
@@ -2331,56 +2330,56 @@ msgstr "Recuperar todo"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr "Limpiar ventana de drop"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr "Abrir configuraciones de la barra amarilla"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 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:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "Subir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr "Bajar"
 
@@ -2388,30 +2387,30 @@ msgstr "Bajar"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr "Desvestir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr "Abrir enlace"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr "Mostrar ventana"
 
@@ -2419,7 +2418,7 @@ msgstr "Mostrar ventana"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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 +2427,135 @@ msgstr "Nivel: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr "Nivel máximo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 msgid "Disregard"
 msgstr "Desatender"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 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:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr "Lista negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr "Fijar como enemigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr "Borrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "Ser amigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "Dejar de ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "Invitar al grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr "Unirse al chat %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "Mostrar vestimenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr "Remover de lista de recogido"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 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:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr "Desproteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr "Proteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Tirar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "Tirar todo"
 
@@ -2564,70 +2563,70 @@ msgstr "Tirar todo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Tirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr "Comandos GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr "Chequear IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr "Ir a"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr "Llamar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr "Expulsar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr "Enmudecer %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr "Desenmudecer %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "Moverse al maestro"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3073,7 +3072,7 @@ msgstr "Editar"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivel: %d"
@@ -3144,30 +3143,30 @@ msgid "Battle"
 msgstr "Batalla"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Anuncio global:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Anuncio global de %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s susurra: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr "%s ahora está Conectado."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s ahora está Desconectado."
@@ -4225,7 +4224,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr "Desconocido"
 
@@ -5639,7 +5638,7 @@ msgstr "QE"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Misiones"
 
@@ -5725,7 +5724,7 @@ msgstr "SKI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -6981,42 +6980,42 @@ msgid "Personal Shop - %s"
 msgstr "Tienda Personal - %s"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "Incrementar"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Puntos disponibles: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidades %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidad %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Habilidad fallida: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, 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:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr "Texto: "
 
@@ -7707,9 +7706,9 @@ msgstr "Mostrar sonrisas"
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "Atajo a la Vestimenta %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9120,7 +9119,7 @@ msgstr "Falta %s de tiempo de renta para el artículo %s."
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "Elemento desconocido"
 
@@ -9391,157 +9390,157 @@ msgstr "OpenGL Moderno"
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "anónimo"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr "Ataque %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr "Ataque mínimo %s"
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr "Ataque máximo %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr "Ataque crítico %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr "Ataque mágico %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr "Defensa %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr "Defensa mínima %s"
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr "Defensa máxima %s"
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr "Defensa crítica %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr "Defensa mágica %s"
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr "Defensa Mágica Mínima %s"
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr "Defensa Mágica Máxima %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr "HP %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr "HP Máximo %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr "MP %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr "Máximo MP %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr "Nivel %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr "Velocidad %s"
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr "Alcance %s"
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr "Escaparse %s"
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr "Mínima evasión %s"
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr "áxima evasión %s"
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr "Ranuras de cartas %s"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr "mascota"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr "habilidad"
 
@@ -10531,6 +10530,3 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
-
-#~ msgid "Client too old."
-#~ msgstr "Cliente es demasiado antiguo."
diff --git a/po/fi.po b/po/fi.po
index 31b3ce30f..e1bd1f54c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
 "fi/)\n"
@@ -129,7 +129,7 @@ msgstr "Killan nimi puuttuu."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Anna nimi."
 
@@ -159,91 +159,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Pelaaja on jo %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pelaaja on nyt %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Pelaajaa ei ollut jätetty huomiotta!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Pelaaja huomioidaan taas!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Pelaajan uudelleenhuomiointi epäonnistui!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Pelaaja on jo pyyhitty!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "ystävä"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "vaimennettu"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutraali"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "mustalistattu"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "vihollinen"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -416,8 +416,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
@@ -501,13 +501,13 @@ msgstr "Apua"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sulje"
 
@@ -1212,7 +1212,7 @@ msgstr "Viesti"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr ""
 
@@ -1396,8 +1396,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(oletus)"
 
@@ -1722,21 +1722,21 @@ msgstr "Luo ryhmä"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1771,7 +1771,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1786,8 +1786,8 @@ msgstr "Tee kaupat"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1799,41 +1799,41 @@ msgstr "Hyökkää"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "Kuiskaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "Paranna"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "Potki killasta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "Muuta kilta-asemaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "Kutsu kiltaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Pommita"
 
@@ -1850,9 +1850,9 @@ msgstr "Pommita"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Liiku"
@@ -1861,8 +1861,8 @@ msgstr "Liiku"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Keskustele"
 
@@ -1876,11 +1876,11 @@ msgstr "Keskustele"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Osta"
 
@@ -1894,11 +1894,11 @@ msgstr "Osta"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Myy"
 
@@ -1906,26 +1906,26 @@ msgstr "Myy"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr "Lisää kommentti"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "Poista hyökkäyslistasta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "Lisää prioriteettihyökkäyslistalle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "Lisää hyökkäyslistaan"
 
@@ -1933,19 +1933,19 @@ 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:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "Lisää ohitettavien listaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr ""
 
@@ -1953,19 +1953,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr ""
 
@@ -1973,7 +1973,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1990,14 +1990,14 @@ msgstr "Poista varuste käytöstä"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Nimeä uudelleen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr ""
 
@@ -2005,38 +2005,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "Lisää nimi keskusteluun"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Pelaajat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "Potki ryhmästä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "Poimi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Lisää keskusteluun"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "Karttaolio"
 
@@ -2046,22 +2046,22 @@ msgstr "Karttaolio"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "Poista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Warppaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr ""
 
@@ -2070,7 +2070,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2078,69 +2078,69 @@ msgstr "Asukokonaisuudet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr "Poista asu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Loitsut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr "Muokkaa loitsua"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Tyhjennä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "Estä korostus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "Salli korostus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr "Älä poista nimeä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "Poista nimi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "Ota poissaolo käyttöön"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "Poista poissaolo käytöstä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Eroa"
 
@@ -2150,84 +2150,84 @@ msgstr "Eroa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr "Kopioi leikepöydälle"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "Muuta asemaa killassa"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "Muuta merkin nimeä       "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "Nimi:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Pelaajakommentti          "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Kommentti:                    "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr "Lisää kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr "Lisää 10 kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr "Lisää puolet kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr "Lisää kaikki kauppaan"
 
@@ -2236,8 +2236,8 @@ msgstr "Lisää kaikki kauppaan"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2245,64 +2245,63 @@ msgstr "Varastoi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "Varastoi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Varastoi puolet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Varastoi kaikki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "Mene kohteen luo"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Ota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Ota 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Ota puolet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Ota kaikki"
 
@@ -2313,56 +2312,56 @@ msgstr "Ota kaikki"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "Käytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "Piilota"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "Näytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 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:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "Siirrä ylös"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr "Siirrä alas"
 
@@ -2370,30 +2369,30 @@ msgstr "Siirrä alas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr "Riisu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr ""
 
@@ -2401,7 +2400,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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 +2409,135 @@ msgstr "Taso: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 msgid "Disregard"
 msgstr "Vaimenna"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 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:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr "Musta lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr "Aseta viholliseksi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr "Pyyhi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "Ystävysty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "Huomioi jälleen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "Seuraa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "Osta (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "Myy (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "Kutsu ryhmään"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "Näytä tavarat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Pudota..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "Pudota kaikki"
 
@@ -2546,70 +2545,70 @@ msgstr "Pudota kaikki"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Pudota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr "Potki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "Mene kohteen luo"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3055,7 +3054,7 @@ msgstr "Muokkaa"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Taso: %d"
@@ -3126,30 +3125,30 @@ msgid "Battle"
 msgstr "Taistelu"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Yleinen ilmoitus:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s ilmoittaa kaikille:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s kuiskaa: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4174,7 +4173,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr ""
 
@@ -5577,7 +5576,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
@@ -5663,7 +5662,7 @@ msgstr "Tai"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Taidot"
 
@@ -6907,42 +6906,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "Ylös"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "%d taitopistettä käyttämättä"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Taitojoukko %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Taito %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -7631,9 +7630,9 @@ msgstr ""
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "Tavarapikavalinta %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9039,7 +9038,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "Tuntematon tavara"
 
@@ -9310,157 +9309,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "nimetön"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""
 
@@ -10442,6 +10441,3 @@ msgstr "%d sekuntia"
 #, c-format
 msgid "%d seconds"
 msgstr ""
-
-#~ msgid "Client too old."
-#~ msgstr "Liian vanha asiakasohjelma."
diff --git a/po/fr.po b/po/fr.po
index 491614b84..06e530a57 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
 "fr/)\n"
@@ -145,7 +145,7 @@ msgstr "Le nom de la guilde est manquant."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Indiques un nom."
 
@@ -176,91 +176,91 @@ msgid "equipped hat %s."
 msgstr "chapeau équipé %s."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Joueur déjà %s !"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Joueur %s avec succès !"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Le joueur n'a pas pu %s !"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Le joueur n'était pas ignoré !"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Le joueur n'est plus ignoré !"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Vous n'avez pas pu arrêter d'ignorer ce joueur !"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Joueur déjà effacé !"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Joueur plus maintenant effacé !"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Le joueur n'a pas pu être effacé !"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "ami"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "écarté"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutre"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "sous liste noire"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "ennemi"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr "Message Rapide"
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -433,8 +433,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
@@ -518,13 +518,13 @@ msgstr "Aide"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fermer"
 
@@ -1237,7 +1237,7 @@ msgstr "Message"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr "Ressusciter"
 
@@ -1425,8 +1425,8 @@ msgstr "Énorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(défaut)"
 
@@ -1751,21 +1751,21 @@ msgstr "Créer un groupe"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1800,7 +1800,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1815,8 +1815,8 @@ msgstr "Échange"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1828,41 +1828,41 @@ msgstr "Attaquer"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "Message privé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "Soigner"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "Éjecter de la guilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "Changer la position dans la guilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "Inviter dans la guilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Annihiler"
 
@@ -1879,9 +1879,9 @@ msgstr "Annihiler"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Déplacement"
@@ -1890,8 +1890,8 @@ msgstr "Déplacement"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Parler"
 
@@ -1905,11 +1905,11 @@ msgstr "Parler"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Acheter"
 
@@ -1923,11 +1923,11 @@ msgstr "Acheter"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Vendre"
 
@@ -1935,26 +1935,26 @@ msgstr "Vendre"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr "Ajouter commentaire"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "Enlever de la liste d'attaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "Ajouter à la liste de priorités d'attaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "Ajouter à la liste d'attaque"
 
@@ -1962,19 +1962,19 @@ 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:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "Ajouter à la liste d'ignorés"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr "Aller jusqu'au maître"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr "Feu"
 
@@ -1982,19 +1982,19 @@ msgstr "Feu"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr "Nourrir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr "Tuer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr "Déposer le butin"
 
@@ -2002,7 +2002,7 @@ msgstr "Déposer le butin"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -2019,14 +2019,14 @@ msgstr "Retirer"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Renommer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr "Retourner à l'œuf"
 
@@ -2034,38 +2034,38 @@ msgstr "Retourner à l'œuf"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "Ajouter le nom dans la conversation"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Joueurs"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "Éjecter du groupe"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "Ramasser"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "Objet de carte"
 
@@ -2075,22 +2075,22 @@ msgstr "Objet de carte"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "Enlever"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Téléportation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr "Bouger la caméra"
 
@@ -2099,7 +2099,7 @@ msgstr "Bouger la caméra"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2107,69 +2107,69 @@ msgstr "Costumes"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr "Effacer la tenue"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Sortilèges"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 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:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Effacer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "Désactiver la surbrillance"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "Activer la surbrillance"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr "Ne pas enlever les noms"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "Enlève le nom"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "Active la fonction Absence"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "Désactive la fonction Absence"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Quitter"
 
@@ -2179,84 +2179,84 @@ msgstr "Quitter"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr "Copier vers le presse-papier"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "Changer de position dans la guilde"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr "fenêtre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr "Déverouiller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr "Verouiller"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "Renommer le panneau de carte "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "Nom :                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Le joueur commente        "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Commentaire :                 "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr "Ajouter à la transaction"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr "Ajouter 10 dans l'échange"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr "Ajouter la moitié dans l'échange"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr "Ajouter pour échanger tout-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
@@ -2265,8 +2265,8 @@ msgstr "Ajouter tout dans l'échange"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2274,64 +2274,63 @@ msgstr "Entreposer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "Entreposer 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr "Tout entreposer-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Entreposer tout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "Aller jusqu'au maître"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Récupérer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Reprendre la moitié"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr "Tout retirer-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
@@ -2342,56 +2341,56 @@ msgstr "Reprendre tout"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "Utiliser"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr "Vider la fenêtre de dépôt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "Cacher"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "Montrer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 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:1958
+#: src/gui/popups/popupmenu.cpp:1956
 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:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "Aller vers le haut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr "Aller vers le bas"
 
@@ -2399,30 +2398,30 @@ msgstr "Aller vers le bas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr "Déshabiller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr "Copier"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr "Coller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr "Ouvrir lien"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr "Afficher la fenêtre"
 
@@ -2430,7 +2429,7 @@ msgstr "Afficher la fenêtre"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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
@@ -2439,135 +2438,135 @@ msgstr "Niveau : %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 msgid "Disregard"
 msgstr "Éviter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 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:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr "Liste noire"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr "Définir comme ennemi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr "Éliminer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "Être ami"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "Ne plus ignorer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "Suivre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr "Imiter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "Acheter (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "Vendre (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "Inviter dans le groupe"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr "Rejoindre la conversation %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "Montrer les objets"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 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:2518
+#: src/gui/popups/popupmenu.cpp:2516
 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:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr "Objet non protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr "Objet protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Déposer..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "Déposer tout"
 
@@ -2575,70 +2574,70 @@ msgstr "Déposer tout"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Déposer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr "MJ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr "Commandes de MJ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr "Vérifier ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr "Aller à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr "Rappeler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr "Virer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr "Mettre en silence %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, 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:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "Aller jusqu'au maître"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3084,7 +3083,7 @@ msgstr "Éditer"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niveau : %d"
@@ -3155,30 +3154,30 @@ msgid "Battle"
 msgstr "Combat"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Annonce globale :"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Annonce globale de %s :"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "Message privé de %s : %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr "%s est maintenant En Ligne."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s est maintenant Hors Ligne."
@@ -4205,7 +4204,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr "inconnu"
 
@@ -5626,7 +5625,7 @@ msgstr "QE"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Quêtes"
 
@@ -5712,7 +5711,7 @@ msgstr "Cmp"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Compétences"
 
@@ -6961,42 +6960,42 @@ msgid "Personal Shop - %s"
 msgstr "Magasin personnel - %s"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "Augmenter"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Points de compétences : %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Compétence choisie : %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Compétence %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Compétence ratée : %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -7691,9 +7690,9 @@ msgstr "Afficher les sourires"
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "Raccourci de tenue %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9104,7 +9103,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "Objet inconnu"
 
@@ -9375,157 +9374,157 @@ msgstr "OpenGL Moderne"
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "anonyme"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr "Attaque %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr "Attaque Mini %s"
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr "Attaque Max %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr "Attaque critique %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr "Attaque M. %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr "Défense %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr "Défense Mini %s"
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr "Défense Max %s"
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr "Défense critique %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr "Défense M. %s"
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr "Défense M. Mini %s"
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr "Défense M. Max %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr "PV %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr "PV Max %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr "PM %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr "PM Max %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr "Niveau %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr "Vitesse %s"
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr "Portée %s"
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr "Fuir %s"
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr "Fuite Mini %s"
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr "Fuite Max %s"
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr "familier"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""
 
@@ -10518,6 +10517,3 @@ msgstr "%d secondes"
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondes"
-
-#~ msgid "Client too old."
-#~ msgstr "Client trop ancien."
diff --git a/po/id.po b/po/id.po
index 25a2aaa3a..b99484c3a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
 "id/)\n"
@@ -134,7 +134,7 @@ msgstr "Nama organisasi hilang."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Tetapkan sebuah nama."
 
@@ -164,91 +164,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Pemain telah %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Pemain berhasil %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Pemain tidak bisa %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Pemain tidak diabaikan!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Pemain tidak lagi diabaikan!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Pemain tidak dapat diabaikan!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Pemain telah terhapus!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Pemain belum lama telah dihapus!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Pemain tidak dapat dihapus!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "teman"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "diabaikan"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "netral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "daftar hitam"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "musuh"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -420,8 +420,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "Sepenuhnya tolak"
 
@@ -505,13 +505,13 @@ msgstr "Bantuan"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Tutup"
 
@@ -1215,7 +1215,7 @@ msgstr "Pesan"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr "Hidupkan"
 
@@ -1400,8 +1400,8 @@ msgstr "Super besar (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(dasar)"
 
@@ -1726,21 +1726,21 @@ msgstr "Buat kelompok"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1775,7 +1775,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1790,8 +1790,8 @@ msgstr "Dagang"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1803,41 +1803,41 @@ msgstr "Serang"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "Bisikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "Menyembuhkan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "Keluarkan dari organisasi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "Ubah posisi di organisasi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "Undang ke organisasi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Sembunyikan"
 
@@ -1854,9 +1854,9 @@ msgstr "Sembunyikan"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Jalan"
@@ -1865,8 +1865,8 @@ msgstr "Jalan"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Berbicara"
 
@@ -1880,11 +1880,11 @@ msgstr "Berbicara"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Beli"
 
@@ -1898,11 +1898,11 @@ msgstr "Beli"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Jual"
 
@@ -1910,26 +1910,26 @@ msgstr "Jual"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr "Tambah komentar"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "Hapus dari daftar serang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "Tambah ke daftar serangan prioritas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "Tambah ke daftar serangan"
 
@@ -1937,19 +1937,19 @@ 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:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "Tambah ke daftar abaikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr "Berjalan ke master"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr "Api"
 
@@ -1957,19 +1957,19 @@ msgstr "Api"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr "Beri makan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr "Bunuh"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr "Jatuhkan rampasan"
 
@@ -1977,7 +1977,7 @@ msgstr "Jatuhkan rampasan"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1994,14 +1994,14 @@ msgstr "Lepaskan"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Ubah nama"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr "Kembali ke telur"
 
@@ -2009,38 +2009,38 @@ msgstr "Kembali ke telur"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "Tambah nama ke obrolan"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Pemain"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "Keluarkan dari kelompok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "Ambil"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Tambah ke obrolan"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "Item Peta"
 
@@ -2050,22 +2050,22 @@ msgstr "Item Peta"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Jebakan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr "Gerakkan kamera"
 
@@ -2074,7 +2074,7 @@ msgstr "Gerakkan kamera"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2082,69 +2082,69 @@ msgstr "Perlengkapan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr "Bersihkan perlengkapan"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Mantra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr "Edit mantra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "Nonaktifkan sorotan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "Aktifkan sorotan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr "Jangan hapus nama"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "Hapus nama"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "Aktifkan keluar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "Nonaktifkan keluar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Meninggalkan"
 
@@ -2154,84 +2154,84 @@ msgstr "Meninggalkan"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr "Salin ke papan"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "Ubah posisi Organisasi"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr "jendela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr "Buka"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr "Tutup"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "Ubah nama tanda peta     "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "Nama:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Komentar pemain           "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "komentar                      "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr "Tambah ke dagangan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr "Tambah ke dagangan 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr "Tambah ke dagangan setengahnya"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr "Tambah ke dagangan semua-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr "Tambah semua ke dagangan"
 
@@ -2240,8 +2240,8 @@ msgstr "Tambah semua ke dagangan"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2249,64 +2249,63 @@ msgstr "Simpan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "Simpan 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Simpan setengah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr "Simpan semua-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Simpan semua"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "Berjalan ke master"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Ambil"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Ambil 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Ambil setengah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr "Ambil semua-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Ambil semua"
 
@@ -2317,56 +2316,56 @@ msgstr "Ambil semua"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "Gunakan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr "Bersihkan jendela buang"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "Sembunyi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "Tampil"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 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:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "Bergerak keatas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr "Bergerak kebawah"
 
@@ -2374,30 +2373,30 @@ msgstr "Bergerak kebawah"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr "Tanggalkan baju"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr "Salin"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr "Tempel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr "Buka tautan"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr "Tampil jendela"
 
@@ -2405,7 +2404,7 @@ msgstr "Tampil jendela"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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
@@ -2414,135 +2413,135 @@ msgstr "Tingkatan: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 msgid "Disregard"
 msgstr "Abaikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 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:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr "Daftar hitam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr "Set sebagai musuh"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "Berteman"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "Batal pengabaian"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "Ikuti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "Beli(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "Jual(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "Undang ke kelompok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr "Gabung obrolan %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "Perlihatkan Item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr "Hapus dari daftar pungut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 msgid "Add to pickup list"
 msgstr "Tambah ke daftar pungut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr "Batal proteksi item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr "Proteksi item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Buang..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "Buang semua"
 
@@ -2550,70 +2549,70 @@ msgstr "Buang semua"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Buang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr "Komando GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr "Cek ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr "Pergi ke"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr "Panggil balik"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr "Keluarkan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "Berjalan ke master"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3059,7 +3058,7 @@ msgstr "Ubah"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -3130,30 +3129,30 @@ msgid "Battle"
 msgstr "Pertarungan"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Pemberitahuan global:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Pemberitahuan global dari %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s membisikkan: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr "%s sekarang Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s sekarang Offline."
@@ -4176,7 +4175,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr "tak diketahui"
 
@@ -5578,7 +5577,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
@@ -5664,7 +5663,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Keahlian"
 
@@ -6906,42 +6905,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "Naik"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "poin Skill yang tersedia: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -9035,7 +9034,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr ""
 
@@ -9306,157 +9305,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""
 
@@ -10436,6 +10435,3 @@ msgstr "%d detik"
 #, c-format
 msgid "%d seconds"
 msgstr "%d detik"
-
-#~ msgid "Client too old."
-#~ msgstr "Versi yang digunakan sudah kadaluarsa."
diff --git a/po/it.po b/po/it.po
index 40cace568..9fd4cfcd1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
 "it/)\n"
@@ -139,7 +139,7 @@ msgstr "Manca il nome della gilda."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Prego specificare un nome."
 
@@ -169,91 +169,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Il giocatore è già %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Il giocatore è stato %s con successo!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Il giocatore non può essere %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Il giocatore non era ignorato!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Giocatore non più ignorato!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Impossibile annullare l'ignoro!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Il giocatore è già cancellato!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Il giocatore non può essere cancellato!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "Amico"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "Disprezzato"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "Neutrale"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "nella lista nera"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "nemico"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -426,8 +426,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "Ignora completamente."
 
@@ -511,13 +511,13 @@ msgstr "Aiuto"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Chiudi"
 
@@ -1224,7 +1224,7 @@ msgstr "Messaggio"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr ""
 
@@ -1411,8 +1411,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(default)"
 
@@ -1737,21 +1737,21 @@ msgstr "Crea gruppo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1786,7 +1786,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1801,8 +1801,8 @@ msgstr "Commercia"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1814,41 +1814,41 @@ msgstr "Attacco"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "Sussurra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "Cura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "Caccia dalla gilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "Cambia ruolo nella gilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "Invita nell gilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Nascondi"
 
@@ -1865,9 +1865,9 @@ msgstr "Nascondi"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Movimento"
@@ -1876,8 +1876,8 @@ msgstr "Movimento"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Parla"
 
@@ -1891,11 +1891,11 @@ msgstr "Parla"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Compra"
 
@@ -1909,11 +1909,11 @@ msgstr "Compra"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Vendi"
 
@@ -1921,26 +1921,26 @@ msgstr "Vendi"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr "Aggiungi commento"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "Rimuovi dalla lista Attacco"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "Aggiungi alla lista Attacco - Priorità"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "Aggiungi alla lista Attacco"
 
@@ -1948,19 +1948,19 @@ 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:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "Aggiungi alla lista Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr ""
 
@@ -1968,19 +1968,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr ""
 
@@ -1988,7 +1988,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -2005,14 +2005,14 @@ msgstr "Togli"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Rinomina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr ""
 
@@ -2020,38 +2020,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "Aggiungi nome alla chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Giocatori"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "Caccia dal party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "Raccogli"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "Oggetto mappa"
 
@@ -2061,22 +2061,22 @@ msgstr "Oggetto mappa"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "Rimuovi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Teletrasporto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr "Muovi telecamera"
 
@@ -2085,7 +2085,7 @@ msgstr "Muovi telecamera"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2093,69 +2093,69 @@ msgstr "Attrezzatura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr "Modifica Incantesimo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Cancella"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "Disabilita highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "Abilita highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr "Non rimuovere il nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "Rimuovi nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "Abilita modalita' Away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "Disabilita modalita' Away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Lascia"
 
@@ -2165,84 +2165,84 @@ msgstr "Lascia"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr "Copia negli appunti"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "Cambia posizione nella gilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "Rinomina mappa           "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Commento giocatore:       "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Commento:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr "Aggiungi allo scambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr "Aggiungi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr "Aggiungi metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr "Aggiungi tutti"
 
@@ -2251,8 +2251,8 @@ msgstr "Aggiungi tutti"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2260,64 +2260,63 @@ msgstr "Magazzino"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "Salva 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Salva metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Salva tutto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "Muovi all'obbiettivo"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Recupera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Ritira 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Ritira metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Ritira tutto"
 
@@ -2328,56 +2327,56 @@ msgstr "Ritira tutto"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "Usa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "Nascondi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "Mostra"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 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:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "Muovi Su"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr "Muovi Giù"
 
@@ -2385,30 +2384,30 @@ msgstr "Muovi Giù"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr "Spogliati"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr "Copia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr "Incolla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr "Apri link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr "Mostra Finestra"
 
@@ -2416,7 +2415,7 @@ msgstr "Mostra Finestra"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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
@@ -2425,135 +2424,135 @@ msgstr "Livello: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 msgid "Disregard"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 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:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr "Lista nera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr "Identifica come nemico"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr "Elimina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "Chiedi amicizia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "Stop Ignora"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "Segui"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "Compra (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "Vendi (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "Invita nel party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "Mostra Oggetti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr "Rimuovi dalla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 msgid "Add to pickup list"
 msgstr "Aggiungi alla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Lascia..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "Lascia tutto"
 
@@ -2561,70 +2560,70 @@ msgstr "Lascia tutto"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Lascia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr "Caccia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "Muovi all'obbiettivo"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3070,7 +3069,7 @@ msgstr "Modifica"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -3141,30 +3140,30 @@ msgid "Battle"
 msgstr "Battaglia"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Annuncio generale:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Annuncio generale da %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s sussurra: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4189,7 +4188,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr "sconosciuto"
 
@@ -5597,7 +5596,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Missioni"
 
@@ -5683,7 +5682,7 @@ msgstr "SKI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Abilità"
 
@@ -6927,42 +6926,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "Su"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Punti abilità disponibili: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Abilità impostata %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Abilità %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -7653,9 +7652,9 @@ msgstr ""
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "Scorciatoia %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9062,7 +9061,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
 
@@ -9333,157 +9332,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "senza nome"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""
 
@@ -10464,6 +10463,3 @@ msgstr "%d secondi"
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondi"
-
-#~ msgid "Client too old."
-#~ msgstr "Versione del Client obsoleta."
diff --git a/po/ja.po b/po/ja.po
index c36bc7cda..6fea09fa1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
 "ja/)\n"
@@ -134,7 +134,7 @@ msgstr "ギルド名がありません."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "名前を入力してください."
 
@@ -164,91 +164,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "プレイヤーは既に%s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "プレイヤーの%sに成功しました!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "プレイヤーを%sできなかった!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "プレイヤーを完全無視できませんでした!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "プレイヤーを完全無視解除しました!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "プレイヤーを完全無視解除できませんでした!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "プレイヤーは削除されています!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "プレイヤーを削除できませんでした!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "友達"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "無視"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "中性"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "ブラックリスト化されています"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "敵"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -420,8 +420,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "完全無視"
 
@@ -505,13 +505,13 @@ msgstr "ヘルプ"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "閉じる"
 
@@ -1218,7 +1218,7 @@ msgstr "メッセージ"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr ""
 
@@ -1402,8 +1402,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(デフォルト)"
 
@@ -1728,21 +1728,21 @@ msgstr "パーティを作る"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1777,7 +1777,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1792,8 +1792,8 @@ msgstr "トレード"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1805,41 +1805,41 @@ msgstr "攻撃"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "ささやく"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "HP回復"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "ギルドから一時的に追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "ギルドでの役割を変更"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "ギルドへ招待"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "消す"
 
@@ -1856,9 +1856,9 @@ msgstr "消す"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "動く"
@@ -1867,8 +1867,8 @@ msgstr "動く"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "話す"
 
@@ -1882,11 +1882,11 @@ msgstr "話す"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "買う"
 
@@ -1900,11 +1900,11 @@ msgstr "買う"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "売る"
 
@@ -1912,26 +1912,26 @@ msgstr "売る"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr "コメントをする"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "攻撃リストから削除する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "攻撃優先リストへ追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "攻撃リストへ追加する"
 
@@ -1939,19 +1939,19 @@ msgstr "攻撃リストへ追加する"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "攻撃無視リストへ追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr ""
 
@@ -1959,19 +1959,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr ""
 
@@ -1979,7 +1979,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1996,14 +1996,14 @@ msgstr "取外す"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "名前を変更する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr ""
 
@@ -2011,38 +2011,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "名前をチャットへ追加する"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "プレイヤー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "パーティから一時的に追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "拾う"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "チャットに追加"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "マップアイテム"
 
@@ -2052,22 +2052,22 @@ msgstr "マップアイテム"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "削除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "ワープ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr "カメラを動かす"
 
@@ -2076,7 +2076,7 @@ msgstr "カメラを動かす"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2084,69 +2084,69 @@ msgstr "服装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr "服装を削除する"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "呪文"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr "呪文を編集する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "クリア"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "強調表示を無効"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "強調表示を有効"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr "名前を消さない"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "名前を削除する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "AFKを有効にする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "AFKを無効にする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "退会"
 
@@ -2156,84 +2156,84 @@ msgstr "退会"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr "クリップボードにコピー"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "ギルドポジションを変更"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "マップサインの名前を変更 "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "名前:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "プレイヤーコメント        "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "コメント:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr "トレードウィンドウに追加"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr "トレードウィンドウに10追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr "トレードウィンドウに半分追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr "トレードウィンドウに全て追加する"
 
@@ -2242,8 +2242,8 @@ msgstr "トレードウィンドウに全て追加する"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2251,64 +2251,63 @@ msgstr "保管"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "10 保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "半分保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "全部保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "ターゲットまで移動"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "10 取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "半分取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "全部取出す"
 
@@ -2319,56 +2318,56 @@ msgstr "全部取出す"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr "ドロップ窓を消す"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "非表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Reset yellow bar"
 msgstr "黄色バーをリセットする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "上へ移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr "下へ移動"
 
@@ -2376,30 +2375,30 @@ msgstr "下へ移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr "脱ぐ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr "コピー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr "ペースト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr ""
 
@@ -2407,7 +2406,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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 +2415,135 @@ msgstr "レベル: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 msgid "Disregard"
 msgstr "無視する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr "ブラックリスト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr "敵に設定する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr "消す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "友達になる"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "完全無視解除"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "フォロー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "買う (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "売る (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "パーティへ招待"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "アイテムを表示する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "落とす..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "全て落とす"
 
@@ -2552,70 +2551,70 @@ msgstr "全て落とす"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "落とす"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr "追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "ターゲットまで移動"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3061,7 +3060,7 @@ msgstr "編集"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -3132,30 +3131,30 @@ msgid "Battle"
 msgstr "バトル"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "グローバルアナウンス:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%sからのアナウンス:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s ささやく: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4180,7 +4179,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr "不明"
 
@@ -5582,7 +5581,7 @@ msgstr "QE"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "クエスト"
 
@@ -5668,7 +5667,7 @@ msgstr "SKI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "スキル"
 
@@ -6910,42 +6909,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "上"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "スキルポイント: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "スキルセット %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "スキル %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -7636,9 +7635,9 @@ msgstr ""
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "服装ショートカット %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9045,7 +9044,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "不明なアイテム"
 
@@ -9316,157 +9315,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "名前なし"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""
 
@@ -10447,6 +10446,3 @@ msgstr "%d秒"
 #, c-format
 msgid "%d seconds"
 msgstr ""
-
-#~ msgid "Client too old."
-#~ msgstr "アップデートが必要です."
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 7acc25f99..71129394b 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-29 16:32+0300\n"
+"POT-Creation-Date: 2016-01-30 15:18+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"
@@ -127,7 +127,7 @@ msgstr ""
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr ""
 
@@ -157,91 +157,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr ""
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr ""
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr ""
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr ""
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr ""
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -414,8 +414,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr ""
 
@@ -499,13 +499,13 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr ""
 
@@ -1209,7 +1209,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr ""
 
@@ -1393,8 +1393,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr ""
 
@@ -1719,21 +1719,21 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1768,7 +1768,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1783,8 +1783,8 @@ msgstr ""
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1796,41 +1796,41 @@ msgstr ""
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
@@ -1847,9 +1847,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr ""
@@ -1858,8 +1858,8 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr ""
 
@@ -1873,11 +1873,11 @@ msgstr ""
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr ""
 
@@ -1891,11 +1891,11 @@ msgstr ""
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr ""
 
@@ -1903,26 +1903,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr ""
 
@@ -1930,19 +1930,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr ""
 
@@ -1950,19 +1950,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr ""
 
@@ -1970,7 +1970,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1987,14 +1987,14 @@ msgstr ""
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr ""
 
@@ -2002,38 +2002,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr ""
 
@@ -2043,22 +2043,22 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr ""
 
@@ -2067,7 +2067,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2075,69 +2075,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2147,84 +2147,84 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr ""
 
@@ -2233,8 +2233,8 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2242,63 +2242,63 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr ""
 
@@ -2309,56 +2309,56 @@ msgstr ""
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr ""
 
@@ -2366,30 +2366,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr ""
 
@@ -2397,7 +2397,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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 +2406,135 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr ""
 
@@ -2542,67 +2542,67 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -3051,7 +3051,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3122,30 +3122,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4168,7 +4168,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr ""
 
@@ -5570,7 +5570,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
@@ -5656,7 +5656,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr ""
 
@@ -6900,42 +6900,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -9029,7 +9029,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr ""
 
@@ -9300,157 +9300,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 0966f0d2d..8f5ef45c1 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
 "language/nl_BE/)\n"
@@ -131,7 +131,7 @@ msgstr "Guild-naam ontbreekt."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Gelieve een naam te specifiëren."
 
@@ -161,91 +161,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Speler reeds %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Speler succesvol %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Speler kan niet %s zijn!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Speler is niet genegeerd!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Speler niet langer genegeerd!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Speler kan niet worden genegeerd!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Speler reeds verwijderd!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Speler is niet langer gewist!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Speler kan niet worden verwijderd!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "vriend"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "genegeerd"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutraal"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "Op de zwarte lijst gezet"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "vijand"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -418,8 +418,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -503,13 +503,13 @@ msgstr "Help"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sluiten"
 
@@ -1213,7 +1213,7 @@ msgstr "Bericht"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr ""
 
@@ -1399,8 +1399,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1725,21 +1725,21 @@ msgstr "Groep aanmaken"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1774,7 +1774,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1789,8 +1789,8 @@ msgstr "Handel"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1802,41 +1802,41 @@ msgstr "Aanvallen"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "Fluister"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "Genees"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "Uit de gilde gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "De positie binnen de gilde veranderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "Uitnodigen voor de gilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1853,9 +1853,9 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Beweeg"
@@ -1864,8 +1864,8 @@ msgstr "Beweeg"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Spreken"
 
@@ -1879,11 +1879,11 @@ msgstr "Spreken"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Kopen"
 
@@ -1897,11 +1897,11 @@ msgstr "Kopen"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Verkopen"
 
@@ -1909,26 +1909,26 @@ msgstr "Verkopen"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "Van de aanvalslijst verwijderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "Aan de prioriteitsaanvalslijst toevoegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "Aan de aanvalslijst toevoegen"
 
@@ -1936,19 +1936,19 @@ 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:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr ""
 
@@ -1956,19 +1956,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr ""
 
@@ -1976,7 +1976,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1993,14 +1993,14 @@ msgstr "Afdoen"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Hernoem"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr ""
 
@@ -2008,38 +2008,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "Naam aan het gesprek toevoegen"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "Raap op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "Plaats voorwerp op de kaart"
 
@@ -2049,22 +2049,22 @@ 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:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "Verwijder"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr ""
 
@@ -2073,7 +2073,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2081,69 +2081,69 @@ msgstr "Kleren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spreuken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr "Wijzig spreuk"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Wissen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "Markering afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "Markering aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "Verwijder naam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "away aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "away afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Verlaat"
 
@@ -2153,84 +2153,84 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen   "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "Naam:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr ""
 
@@ -2239,8 +2239,8 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2248,64 +2248,63 @@ msgstr "Opslaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "Plaats 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Plaats de helft"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Plaats alles"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "Beweeg tot aan Doel"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Afhalen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
@@ -2316,56 +2315,56 @@ msgstr "Haal alles op"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2373,30 +2372,30 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr ""
 
@@ -2404,7 +2403,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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 +2412,135 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 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:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 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:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
@@ -2549,70 +2548,70 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr "Ga naar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr "Schop"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "Beweeg tot aan Doel"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3058,7 +3057,7 @@ msgstr "Wijzig"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niv: %d"
@@ -3129,30 +3128,30 @@ msgid "Battle"
 msgstr "Gevecht"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Globale aankondiging:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globale aankondiging van %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s fluistert: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4175,7 +4174,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr ""
 
@@ -5583,7 +5582,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
@@ -5669,7 +5668,7 @@ msgstr "VAAR"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Vaardigheden"
 
@@ -6913,42 +6912,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "Omhoog"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Vaardigheidspunten vrijgegeven: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Vaardigheid Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Vaardigheid %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -7639,9 +7638,9 @@ msgstr ""
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "Snelkoppeling naar voorwerp %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9048,7 +9047,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
@@ -9319,157 +9318,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "naamloos"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""
 
@@ -10450,6 +10449,3 @@ msgstr "%d seconden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
-
-#~ msgid "Client too old."
-#~ msgstr "Client is te oud."
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 0966f0d2d..8f5ef45c1 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
 "language/nl_BE/)\n"
@@ -131,7 +131,7 @@ msgstr "Guild-naam ontbreekt."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Gelieve een naam te specifiëren."
 
@@ -161,91 +161,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Speler reeds %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Speler succesvol %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Speler kan niet %s zijn!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Speler is niet genegeerd!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Speler niet langer genegeerd!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Speler kan niet worden genegeerd!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Speler reeds verwijderd!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Speler is niet langer gewist!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Speler kan niet worden verwijderd!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "vriend"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "genegeerd"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutraal"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "Op de zwarte lijst gezet"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "vijand"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -418,8 +418,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -503,13 +503,13 @@ msgstr "Help"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Sluiten"
 
@@ -1213,7 +1213,7 @@ msgstr "Bericht"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr ""
 
@@ -1399,8 +1399,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1725,21 +1725,21 @@ msgstr "Groep aanmaken"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1774,7 +1774,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1789,8 +1789,8 @@ msgstr "Handel"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1802,41 +1802,41 @@ msgstr "Aanvallen"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "Fluister"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "Genees"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "Uit de gilde gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "De positie binnen de gilde veranderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "Uitnodigen voor de gilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1853,9 +1853,9 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Beweeg"
@@ -1864,8 +1864,8 @@ msgstr "Beweeg"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Spreken"
 
@@ -1879,11 +1879,11 @@ msgstr "Spreken"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Kopen"
 
@@ -1897,11 +1897,11 @@ msgstr "Kopen"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Verkopen"
 
@@ -1909,26 +1909,26 @@ msgstr "Verkopen"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "Van de aanvalslijst verwijderen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "Aan de prioriteitsaanvalslijst toevoegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "Aan de aanvalslijst toevoegen"
 
@@ -1936,19 +1936,19 @@ 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:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr ""
 
@@ -1956,19 +1956,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr ""
 
@@ -1976,7 +1976,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1993,14 +1993,14 @@ msgstr "Afdoen"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Hernoem"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr ""
 
@@ -2008,38 +2008,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "Naam aan het gesprek toevoegen"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "Raap op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "Plaats voorwerp op de kaart"
 
@@ -2049,22 +2049,22 @@ 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:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "Verwijder"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr ""
 
@@ -2073,7 +2073,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2081,69 +2081,69 @@ msgstr "Kleren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spreuken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr "Wijzig spreuk"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Wissen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "Markering afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "Markering aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "Verwijder naam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "away aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "away afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Verlaat"
 
@@ -2153,84 +2153,84 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "Kaart bordje hernoemen   "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "Naam:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr ""
 
@@ -2239,8 +2239,8 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2248,64 +2248,63 @@ msgstr "Opslaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "Plaats 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Plaats de helft"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Plaats alles"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "Beweeg tot aan Doel"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Afhalen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Haal de helft op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
@@ -2316,56 +2315,56 @@ msgstr "Haal alles op"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2373,30 +2372,30 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr ""
 
@@ -2404,7 +2403,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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 +2412,135 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 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:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 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:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
@@ -2549,70 +2548,70 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr "Ga naar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr "Schop"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "Beweeg tot aan Doel"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3058,7 +3057,7 @@ msgstr "Wijzig"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niv: %d"
@@ -3129,30 +3128,30 @@ msgid "Battle"
 msgstr "Gevecht"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Globale aankondiging:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Globale aankondiging van %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s fluistert: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4175,7 +4174,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr ""
 
@@ -5583,7 +5582,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
@@ -5669,7 +5668,7 @@ msgstr "VAAR"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Vaardigheden"
 
@@ -6913,42 +6912,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "Omhoog"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Vaardigheidspunten vrijgegeven: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Vaardigheid Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Vaardigheid %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -7639,9 +7638,9 @@ msgstr ""
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "Snelkoppeling naar voorwerp %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9048,7 +9047,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
@@ -9319,157 +9318,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "naamloos"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""
 
@@ -10450,6 +10449,3 @@ msgstr "%d seconden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
-
-#~ msgid "Client too old."
-#~ msgstr "Client is te oud."
diff --git a/po/pl.po b/po/pl.po
index abf0c26e0..0e693562b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
 "pl/)\n"
@@ -135,7 +135,7 @@ msgstr "Brak nazwy gildii."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Proszę wpisać prawidłową nazwę."
 
@@ -165,91 +165,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Gracz jest już %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Gracz jest teraz %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Gracz nie może być %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Gracz nie był ignorowany!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Gracz już nie jest ignorowany!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Gracz nie może być odignorowany!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Gracz został usunięty!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Gracz nie mógł zostać usunięty!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "znajomy"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "lekceważony"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutralny"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "dodany/a do czarnej listy"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "wróg"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -423,8 +423,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "Całkowicie ignoruj"
 
@@ -508,13 +508,13 @@ msgstr "Pomoc"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zamknij"
 
@@ -1218,7 +1218,7 @@ msgstr "Wiadomość"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr "Wskrześ"
 
@@ -1405,8 +1405,8 @@ msgstr "Ogromna (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(domyślne)"
 
@@ -1731,21 +1731,21 @@ msgstr "Utwórz grupę"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1780,7 +1780,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1795,8 +1795,8 @@ msgstr "Handel"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1808,41 +1808,41 @@ msgstr "Atak"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "Szept"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "Lecz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "Wyrzuć z gildii"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "Zmień pozycję w gildii"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "Zaproś do gildii"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Wysadź w powietrze"
 
@@ -1859,9 +1859,9 @@ msgstr "Wysadź w powietrze"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Podejdź"
@@ -1870,8 +1870,8 @@ msgstr "Podejdź"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Rozmowa"
 
@@ -1885,11 +1885,11 @@ msgstr "Rozmowa"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Kup"
 
@@ -1903,11 +1903,11 @@ msgstr "Kup"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Sprzedaj"
 
@@ -1915,26 +1915,26 @@ msgstr "Sprzedaj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr "Dodaj komentarz"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "Usuń z listy ataku"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "Dodaj do listy priorytetów"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "Dodaj do listy atakowanych"
 
@@ -1942,19 +1942,19 @@ 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:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "Dodaj do listy ignorowanych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr ""
 
@@ -1962,19 +1962,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr ""
 
@@ -1982,7 +1982,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1999,14 +1999,14 @@ msgstr "Zdejmij"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Zmień nazwę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr ""
 
@@ -2014,38 +2014,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "Wpisz do czatu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Gracze"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "Wyrzuć z grupy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "Podnieś"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Dodaj do czatu"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "Portal"
 
@@ -2055,22 +2055,22 @@ msgstr "Portal"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "Usuń"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Teleport"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr "Przesuwaj kamerę"
 
@@ -2079,7 +2079,7 @@ msgstr "Przesuwaj kamerę"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2087,69 +2087,69 @@ msgstr "Stroje"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr "Usuń ubiór"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Zaklęcia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr "Edytuj zaklęcie"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Wyczyść"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "Wyłącz alarm"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "Włącz alarm"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr "Nie usuwaj imion"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "Usuń imię"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "Włącz tryb AFK"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "Wyłącz tryb AFK"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Opuść"
 
@@ -2159,84 +2159,84 @@ msgstr "Opuść"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr "Skopiuj do schowka"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "Zmień pozycję gildii"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr "okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr "odblokuj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr "zablokuj"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "Zmień nazwę drogowskazu "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "Nick:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Komentarz gracza          "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Komentarz:                    "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr "Dodaj do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr "Dodaj 10 do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr "Dodaj połowę do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr "Dodaj do handlu wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr "Dodaj wszystko do handlu"
 
@@ -2245,8 +2245,8 @@ msgstr "Dodaj wszystko do handlu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2254,64 +2254,63 @@ msgstr "Podaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "Podaj 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Podaj połowę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr "Podaj wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Podaj wszystko"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "Podejdź do celu"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Pobierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Pobierz 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Pobierz połowę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr "Pobierz wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Pobierz wszystko"
 
@@ -2322,56 +2321,56 @@ msgstr "Pobierz wszystko"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "Użyj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr "Wyczyść okno upuszczeń."
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "Ukryj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "Pokaż"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 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:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "W górę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr "W dół"
 
@@ -2379,30 +2378,30 @@ msgstr "W dół"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr "Rozbierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr "Kopiuj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr "Wklej"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr "Otwórz adres internetowy"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr "Pokaż okno"
 
@@ -2410,7 +2409,7 @@ msgstr "Pokaż okno"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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 +2418,135 @@ msgstr "Poziom: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 msgid "Disregard"
 msgstr "Lekceważ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 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:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr "Czarna lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr "Ustaw jako wroga"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr "Usuń"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "Dodaj do znajomych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "Odignoruj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "Podążaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "Kup (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "Sprzedaj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "Zaproś do grupy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "Pokaż przedmioty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr "Usuń z listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 msgid "Add to pickup list"
 msgstr "Dodaj do listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr "Przestań chronić przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr "Chroń przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Upuść..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "Upuść wszystko"
 
@@ -2555,70 +2554,70 @@ msgstr "Upuść wszystko"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Upuść"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr "Polecenia GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr "Sprawdź IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr "Idź do"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr "Przywołaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr "Wyrzuć"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "Podejdź do celu"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3064,7 +3063,7 @@ msgstr "Edycja"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Poziom: %d"
@@ -3135,30 +3134,30 @@ msgid "Battle"
 msgstr "Bitwa"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Ogłoszenie ogólne:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Ogłoszenie ogólne od %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s szepcze: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr "%s jest teraz Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s jest teraz Offline."
@@ -4185,7 +4184,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr "nieznane"
 
@@ -5594,7 +5593,7 @@ msgstr "OM"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Misje"
 
@@ -5680,7 +5679,7 @@ msgstr "SKI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Zdolności"
 
@@ -6931,42 +6930,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "Podwyż"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Dostępne punkty umiejętności: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Zestaw umiejętności %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Umiejętność %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -7657,9 +7656,9 @@ msgstr "Pokaż Emotki"
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "Skrót ubioru %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9064,7 +9063,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "Nieznany przedmiot"
 
@@ -9335,157 +9334,157 @@ msgstr "Nowoczesny OpenGL"
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "nienazwany"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr "Atak %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr "Atak krytyczny %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr "Atak magią %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr "Obrona %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr "Obrona krytyczna %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr "Obrona magiczna %s"
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr "PŻ %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr "PM %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr "Poziom %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr "Prędkość poruszania %s"
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr "Zasięg %s"
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr "Ominięcie %s"
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr "zwierzątko"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""
 
@@ -10468,6 +10467,3 @@ msgstr "%d sekund/y"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund/y"
-
-#~ msgid "Client too old."
-#~ msgstr "Klient jest zbyt nieaktualny."
diff --git a/po/pt.po b/po/pt.po
index be2f3615d..5224dcc90 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
 "pt/)\n"
@@ -131,7 +131,7 @@ msgstr "Falta o nome da guilda."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
@@ -161,91 +161,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pode ser %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador(a)!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Jogador não pode ser apagado!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "amigo(a)"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "ignorado"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutro"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "Na Lista Negra"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "Inimigo"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -418,8 +418,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -503,13 +503,13 @@ msgstr "Ajuda"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fechar"
 
@@ -1218,7 +1218,7 @@ msgstr "Mensagem"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr ""
 
@@ -1406,8 +1406,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1732,21 +1732,21 @@ msgstr "Criar grupo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1781,7 +1781,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1796,8 +1796,8 @@ msgstr "Negócios"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1809,41 +1809,41 @@ msgstr "Atacar"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "Sussuro"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "Curar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "Chutar da Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "Mudar posição da Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "Convidar para Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Desaparecer"
 
@@ -1860,9 +1860,9 @@ msgstr "Desaparecer"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Mover"
@@ -1871,8 +1871,8 @@ msgstr "Mover"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Falar"
 
@@ -1886,11 +1886,11 @@ msgstr "Falar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1904,11 +1904,11 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Vender"
 
@@ -1916,26 +1916,26 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "Remover da Lista de Ataques"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "Adicionar a prioridade na lista de ataques"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
@@ -1943,19 +1943,19 @@ 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:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr ""
 
@@ -1963,19 +1963,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr ""
 
@@ -1983,7 +1983,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -2000,14 +2000,14 @@ msgstr "Desequipar"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Renomear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr ""
 
@@ -2015,38 +2015,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "Chutar do grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Nome no chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "Mapa Item"
 
@@ -2056,22 +2056,22 @@ msgstr "Mapa Item"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "A Remover"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Urdidura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr "Mover câmera"
 
@@ -2080,7 +2080,7 @@ msgstr "Mover câmera"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2088,69 +2088,69 @@ msgstr "Roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr "Limpar equipamento"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr "Editar Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Limpar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr "Não remova o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "Remover nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "Habilitar longe do teclado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "Desabilitar longe do teclado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Sair"
 
@@ -2160,84 +2160,84 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr "CopiaCopiar para a área de transferência"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Comentário do jogador     "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Comentário:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr "Add. na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr "Add. 10 na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr "Add. metade na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr "Adicionar todos para troca-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
@@ -2246,8 +2246,8 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2255,64 +2255,63 @@ msgstr "Armazenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "Guardar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Guardar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr "Armazenar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Guardar tudo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "Mover para o alvo"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Retirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr "Recuperar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
@@ -2323,56 +2322,56 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 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:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "Mover a cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr "Mover a baixo"
 
@@ -2380,30 +2379,30 @@ msgstr "Mover a baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr "Abrir link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr "Mostrar janela"
 
@@ -2411,7 +2410,7 @@ msgstr "Mostrar janela"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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
@@ -2420,135 +2419,135 @@ msgstr "Nível: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 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:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 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:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr "Definir como inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "Ser Amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "Mostar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr "Remover lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 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:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -2556,70 +2555,70 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr "Chutar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "Mover para o alvo"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3065,7 +3064,7 @@ msgstr "Editar"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
@@ -3136,30 +3135,30 @@ msgid "Battle"
 msgstr "Batalha"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Anúncio geral:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Anúncio geral de %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr "%s está online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s está offline."
@@ -4184,7 +4183,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr "desconhecido"
 
@@ -5590,7 +5589,7 @@ msgstr "MSS"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Missões"
 
@@ -5676,7 +5675,7 @@ msgstr "HAB"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -6925,42 +6924,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "+"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -7650,9 +7649,9 @@ msgstr ""
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "Atalho de roupa: %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9059,7 +9058,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
@@ -9330,157 +9329,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sem nome"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""
 
@@ -10461,6 +10460,3 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
-
-#~ msgid "Client too old."
-#~ msgstr "Cliente muito antigo."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8052efe9a..ba7e71635 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
 "language/pt_BR/)\n"
@@ -144,7 +144,7 @@ msgstr "Falta o nome da guilda."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
@@ -174,91 +174,91 @@ msgid "equipped hat %s."
 msgstr "chapéu %s equipado."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Jogador já %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Jogador %s com sucesso!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Jogador não pôde ser %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais sendo ignorado!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Jogador já apagado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Jogador não mais apagado!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Jogador não pôde ser apagado!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "amigo(a)"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "ignorado"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutro"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "Na Lista Negra"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "inimigo"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr "Mensagem rápida"
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr "Config value: %s"
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr "Server config value: %s"
@@ -431,8 +431,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -516,13 +516,13 @@ msgstr "Ajuda"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Fechar"
 
@@ -1230,7 +1230,7 @@ msgstr "Mensagem"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr "Reviver"
 
@@ -1418,8 +1418,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1744,21 +1744,21 @@ msgstr "Criar grupo"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1793,7 +1793,7 @@ msgstr "Cartões: "
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1808,8 +1808,8 @@ msgstr "Negociação"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1821,41 +1821,41 @@ msgstr "Atacar"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "Sussurro"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "Cura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "Expulsar da guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "Mudar pos na Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "Convidar pra Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Desaparecer"
 
@@ -1872,9 +1872,9 @@ msgstr "Desaparecer"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Mover"
@@ -1883,8 +1883,8 @@ msgstr "Mover"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Falar"
 
@@ -1898,11 +1898,11 @@ msgstr "Falar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Comprar"
 
@@ -1916,11 +1916,11 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Vender"
 
@@ -1928,26 +1928,26 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "Remover da lista de ataque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "Adicionar na prioridade da lista de ataques"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
@@ -1955,19 +1955,19 @@ 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:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "Adicionar a lista de ignorados"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr "Mover para o mestre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr "Dispensar"
 
@@ -1975,19 +1975,19 @@ msgstr "Dispensar"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr "Alimentar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr "Matar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr "Descartar saque"
 
@@ -1995,7 +1995,7 @@ msgstr "Descartar saque"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -2012,14 +2012,14 @@ msgstr "Desequipar"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Renomear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr "Retornar ao ovo"
 
@@ -2027,38 +2027,38 @@ msgstr "Retornar ao ovo"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "Expulsar do grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Nome no chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "Mapa Item"
 
@@ -2068,22 +2068,22 @@ msgstr "Mapa Item"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "Remover"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Urdidura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr "Mover câmera"
 
@@ -2092,7 +2092,7 @@ msgstr "Mover câmera"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2100,69 +2100,69 @@ msgstr "Roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr "Editar feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Limpar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr "Não retire o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "Remover o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "Habilitar modo indisponível"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "Desabilitar modo indisponível"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Sair"
 
@@ -2172,84 +2172,84 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr "Copiar para a área de transferência"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr "janela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr "Desbloquear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr "Bloquear"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "Renomear mapa            "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Comentário do jogador     "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Comentário:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr "Adicionar na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr "Adicionar 10 na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr "Adicionar metade na negociação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr "Adicionar todos para negociação-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr "Adicionar todos na negociação"
 
@@ -2258,8 +2258,8 @@ msgstr "Adicionar todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2267,64 +2267,63 @@ msgstr "Armazenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "Guardar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Guardar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr "Armazenar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Guardar tudo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "Mover para o mestre"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Retirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr "Recuperar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
@@ -2335,56 +2334,56 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr "Abrir as configurações da barra amarela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 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:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "Mover para cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr "Mover para baixo"
 
@@ -2392,30 +2391,30 @@ msgstr "Mover para baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr "Despir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr "Abrir endereço"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr "Mostrar Janela"
 
@@ -2423,7 +2422,7 @@ msgstr "Mostrar Janela"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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
@@ -2432,135 +2431,135 @@ msgstr "Nível: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr "Level máximo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 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:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 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:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr "Definir como inimigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "Ser amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr "Entrar no chat %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "Mostrar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr "Remover da lista de pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 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:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr "Desproteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr "Proteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -2568,70 +2567,70 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr "Comandos de GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr "Checar IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr "Ir à"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr "Trazer jogador"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr "Chutar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr "Silenciar %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr "Liberar %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "Mover para o mestre"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3077,7 +3076,7 @@ msgstr "Editar"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
@@ -3148,30 +3147,30 @@ msgid "Battle"
 msgstr "Batalha"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Anúncio geral:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Anúncio geral de %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr "%s estão online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s estão offline."
@@ -4326,7 +4325,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr "desconhecido"
 
@@ -5736,7 +5735,7 @@ msgstr "MSS"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Missões"
 
@@ -5822,7 +5821,7 @@ msgstr "HAB"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Habilidades"
 
@@ -7071,42 +7070,42 @@ msgid "Personal Shop - %s"
 msgstr "Loja Pessoal - %s"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "+"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Habilidade falhou: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, 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:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr "Texto: "
 
@@ -7796,9 +7795,9 @@ msgstr "Mostrar carinhas"
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "Atalho de Roupa %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9206,7 +9205,7 @@ msgstr "Faltam %s tempo de aluguel pelo item %s."
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
@@ -9477,157 +9476,157 @@ msgstr "OpenGL Moderno"
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "sem nome"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr "Ataque %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr "Ataque mínimo %s"
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr "Ataque máximo %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr "Ataque crítico %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr "Ataque M. %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr "Defesa %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr "Defesa mínima %s"
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr "Defesa máxima %s"
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr "Defesa crítica %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr "Defesa M. %s"
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr "Defesa M. Mínima %s"
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr "Defesa M. Máxima %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr "HP %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr "HP máximo %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr "MP %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr "MP máximo %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr "Nível %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr "Velocidade %s"
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr "Alcance %s"
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr "Evasão %s"
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr "Escape mínimo %s"
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr "Escape Máximo %s"
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr "Espaços para cartões %s"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr "animal de estimação"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr "Habilidade"
 
@@ -10614,6 +10613,3 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d Segundos"
-
-#~ msgid "Client too old."
-#~ msgstr "Cliente muito antigo."
diff --git a/po/ru.po b/po/ru.po
index cf93a3712..7ad32cc03 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -19,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 11:25+0000\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"
 "Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
 "ru/)\n"
@@ -141,7 +141,7 @@ msgstr "Не задано имя гильдии."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Пожалуйста, укажите имя."
 
@@ -171,91 +171,91 @@ msgid "equipped hat %s."
 msgstr "Одета шапка: %s."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Игрок уже %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Игрок удачно %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Игрок не может быть %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Игрок не был игнорируемым!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Игрок больше не игнорируется!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Игрок не может быть удален из списка игнорирования!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Игрок и так уже удален!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Игрок больше не удален!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Игрок не может быть удален!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "друг"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "пренебрегаемый"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "нейтральный"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "добавлен в черный список"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "враг"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr "Быстрое сообщение"
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr "Значение настройки: %s"
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr "Значение настройки для этого сервера: %s"
@@ -430,8 +430,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "Полностью игнорировать"
 
@@ -515,13 +515,13 @@ msgstr "Помощь"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Закрыть"
 
@@ -1227,7 +1227,7 @@ msgstr "Сообщение"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr "Оживить"
 
@@ -1415,8 +1415,8 @@ msgstr "Огромный (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(по умолчанию)"
 
@@ -1741,21 +1741,21 @@ msgstr "Создать группу"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1790,7 +1790,7 @@ msgstr "Карты: "
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1805,8 +1805,8 @@ msgstr "Торговать"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1818,41 +1818,41 @@ msgstr "Атака"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "Приват"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "Лечить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "Выкинуть из гильдии"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "Пригласить в гильдию"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Уничтожить"
 
@@ -1869,9 +1869,9 @@ msgstr "Уничтожить"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Движение"
@@ -1880,8 +1880,8 @@ msgstr "Движение"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Разговор"
 
@@ -1895,11 +1895,11 @@ msgstr "Разговор"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Купить"
 
@@ -1913,11 +1913,11 @@ msgstr "Купить"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Продать"
 
@@ -1925,26 +1925,26 @@ msgstr "Продать"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr "Добавить комментарий"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "Удалить из списка атаки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "Добавить в приоритетный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "Добавить в список атаки"
 
@@ -1952,19 +1952,19 @@ msgstr "Добавить в список атаки"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "Добавить в список игнорирования"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr "Перейти к владельцу"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr "Уволить"
 
@@ -1972,19 +1972,19 @@ msgstr "Уволить"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr "Накормить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr "Убить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr "Бросить лут"
 
@@ -1992,7 +1992,7 @@ msgstr "Бросить лут"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -2009,14 +2009,14 @@ msgstr "Снять"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Переименовать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr "Вернут в яйцо"
 
@@ -2024,38 +2024,38 @@ msgstr "Вернут в яйцо"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "Добавить имя в чат"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Игроки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "Выкинуть из группы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "Поднять"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "Элемент карты"
 
@@ -2065,22 +2065,22 @@ msgstr "Элемент карты"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "Удалить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Прыгнуть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr "Передвинуть камеру"
 
@@ -2089,7 +2089,7 @@ msgstr "Передвинуть камеру"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2097,69 +2097,69 @@ msgstr "Наряды"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr "Очистить наряд"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Заклинания"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr "Изменить заклинание"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Очистить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "Отключить уведомление"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "Включить уведомление"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr "Не скрывать имя"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "Скрывать имя"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "Разрешить режим \"отошел\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "Запретить режим \"отошел\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Покинуть"
 
@@ -2169,84 +2169,84 @@ msgstr "Покинуть"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr "Копировать в буфер обмена"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr "окно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr "Разблокировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr "Заблокировать"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "Имя:                     "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Комментарий игрока        "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Комментарий:                  "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr "Добавить к сделке"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr "Добавить к сделке 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr "Добавить к сделке половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr "Добавить к торговле все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
@@ -2255,8 +2255,8 @@ msgstr "Добавить к торговле все"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2264,64 +2264,63 @@ msgstr "Сохранить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "Сохранить 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Сохранить половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr "Сохранить все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Сохранить все"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "Перейти к владельцу"
+msgstr "Поместить в крафт..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Получить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Получить половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr "Забрать все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Получить все"
 
@@ -2332,56 +2331,56 @@ msgstr "Получить все"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "Использовать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr "Очистить окно дропов"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "Спрятать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "Показать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr "Открыть настройки желтой панели"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "Передвинуть выше"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
@@ -2389,30 +2388,30 @@ msgstr "Передвинуть ниже"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr "Раздеть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr "Копировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr "Вставить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr "Открыть ссылку"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr "Показать окно"
 
@@ -2420,7 +2419,7 @@ msgstr "Показать окно"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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
@@ -2429,135 +2428,135 @@ msgstr "Уровень: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr "Макс. уровень"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 msgid "Disregard"
 msgstr "Пренебречь"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Игнорировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr "Черный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr "Сделать врагом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr "Стереть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "Подружиться"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "Не игнорировать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "Следовать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr "Имитировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "Купить (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "Продать (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "Пригласить в группу"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr "Присоединиться к чату %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "Показать предметы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr "Удалить из поднятия"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 msgid "Add to pickup list"
 msgstr "Сделать поднимаемым"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr "Снять защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr "Поставить защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Бросить..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "Бросить все"
 
@@ -2565,70 +2564,70 @@ msgstr "Бросить все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Бросить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr "Коменды ГМ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr "Проверить IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr "Перейти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr "Вызвать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr "Кикнуть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr "Приглушить %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr "Убрать пришлушение %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "Перейти к владельцу"
+msgstr "Поместить в крафт %d"
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3074,7 +3073,7 @@ msgstr "Изменить"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Уровень: %d"
@@ -3145,30 +3144,30 @@ msgid "Battle"
 msgstr "Битва"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Глобальное объявление:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Глобальное объявление от %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s шепчет: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr "%s вошел(а)."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s вышел(а)."
@@ -4196,7 +4195,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr "неизвестно"
 
@@ -5611,7 +5610,7 @@ msgstr "КВ"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Квесты"
 
@@ -5697,7 +5696,7 @@ msgstr "УМ"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Навыки"
 
@@ -6950,42 +6949,42 @@ msgid "Personal Shop - %s"
 msgstr "Персональный магазин - %s"
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "Верх"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Очков навыков осталось: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Навык %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Навык %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Неудача навыка: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Добавить текст к скилу %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr "Текст: "
 
@@ -7676,9 +7675,9 @@ msgstr "Показать смайлы"
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "Комбинация клавиш наряда %d"
+msgstr "Комбинация клавиш крафта %d"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -8679,7 +8678,7 @@ msgstr "Вас навсегда забанили. Пожалуйста, свяж
 #. 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 "Клиент устарел или неправильный тип сервера."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:145 src/net/eathena/loginrecv.cpp:83
@@ -9084,7 +9083,7 @@ msgstr "Осталось %s арендного времени для %s."
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
 
@@ -9355,157 +9354,157 @@ msgstr "Новый OpenGL"
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "безымянный"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr "Атака %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr "Мин. атака %s"
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr "Макс. атака %s"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr "Критическая атака %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr "Маг. атака %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr "Защита %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr "Мин. защита %s"
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr "Макс. защита %s"
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr "Защита от критической атаки %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr "Маг. защита %s"
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr "Мин. магическая защита %s"
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr "Макс. магическая защита %s"
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr "Жизнь %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr "Макс. здоровье %s"
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr "Мана %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr "Макс. мана %s"
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr "Уровень: %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr "Скорость %s"
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr "Расстояние %s"
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr "Уклонение %s"
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr "Мин. уклонение %s"
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr "Макс. уклонение %s"
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr "Слоты %s"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr "животное"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr "Скил"
 
@@ -10490,6 +10489,3 @@ msgstr "%d секунда"
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
-
-#~ msgid "Client too old."
-#~ msgstr "Клиент устарел."
diff --git a/po/sr.po b/po/sr.po
index 072226e7e..ebc61b3f6 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
 "sr/)\n"
@@ -130,7 +130,7 @@ msgstr "Nedostaje ime udruženja."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Definiši ime."
 
@@ -160,91 +160,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Igrač je već %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Igrač je uspešno %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Igrač nije mogao biti %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Igrač nije ignorisan!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Igrač nije više ignorisan!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Igrač nije mogao da se de-ignoriše!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Igrač je već obrisan!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Igrač se nije mogao obrisati!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "prijatelj"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "zanemaren"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutralan"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -418,8 +418,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr ""
 
@@ -503,13 +503,13 @@ msgstr "Pomoć"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Zatvori"
 
@@ -1213,7 +1213,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr ""
 
@@ -1397,8 +1397,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr ""
 
@@ -1723,21 +1723,21 @@ msgstr ""
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1772,7 +1772,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1787,8 +1787,8 @@ msgstr ""
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1800,41 +1800,41 @@ msgstr ""
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
@@ -1851,9 +1851,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr ""
@@ -1862,8 +1862,8 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr ""
 
@@ -1877,11 +1877,11 @@ msgstr ""
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr ""
 
@@ -1895,11 +1895,11 @@ msgstr ""
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr ""
 
@@ -1907,26 +1907,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr ""
 
@@ -1934,19 +1934,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr ""
 
@@ -1954,19 +1954,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr ""
 
@@ -1974,7 +1974,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1991,14 +1991,14 @@ msgstr "Skini"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr ""
 
@@ -2006,38 +2006,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Igrači"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Dodaj u prozor za ćaskanje"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr ""
 
@@ -2047,22 +2047,22 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr ""
 
@@ -2071,7 +2071,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2079,69 +2079,69 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr ""
 
@@ -2151,84 +2151,84 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "Ime:                     "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr ""
 
@@ -2237,8 +2237,8 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2246,63 +2246,63 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "Sačuvaj 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Sačuvaj pola"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Sačuvaj sve"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Uzmi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Uzmi pola"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Uzmi sve"
 
@@ -2313,56 +2313,56 @@ msgstr "Uzmi sve"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr ""
 
@@ -2370,30 +2370,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr ""
 
@@ -2401,7 +2401,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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 +2410,135 @@ msgstr "Nivo: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 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:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr ""
 
@@ -2546,67 +2546,67 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
+#: src/gui/popups/popupmenu.cpp:2722
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
@@ -3055,7 +3055,7 @@ msgstr "Izmeni"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3126,30 +3126,30 @@ msgid "Battle"
 msgstr "Bitka"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Opšte obaveštenje:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Opšte obaveštenje od %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s šapuće: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4174,7 +4174,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr ""
 
@@ -5576,7 +5576,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
@@ -5662,7 +5662,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr ""
 
@@ -6908,42 +6908,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -7632,9 +7632,9 @@ msgstr ""
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "Prečica emocije: %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9037,7 +9037,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr ""
 
@@ -9308,157 +9308,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index edbcafe7c..e97998d7c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
 "language/sv_SE/)\n"
@@ -128,7 +128,7 @@ msgstr "Guild-namn saknas."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Var vänlig specificera ett namn."
 
@@ -158,91 +158,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Spelare är redan %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Spelare %s lyckades!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Spelare kunde inte bli %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Spelaren ignorerades inte!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Spelaren är inte längre ignorerad!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Spelaren kunde inte bli oignorerad!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Spelare är redan borttagen!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Spelaren kunde inte tas bort!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "vän"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "ignorera"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "blacklistad"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "enemy"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -415,8 +415,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -500,13 +500,13 @@ msgstr "Hjälp"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Stäng"
 
@@ -1213,7 +1213,7 @@ msgstr "Meddelande"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr "Återuppliva"
 
@@ -1397,8 +1397,8 @@ msgstr "Skitstor (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1723,21 +1723,21 @@ msgstr "Skapa Party"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1772,7 +1772,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1787,8 +1787,8 @@ msgstr "Trade"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1800,41 +1800,41 @@ msgstr "Attackera"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "Viska"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "Hela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "Kicka från guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "Ändra position i guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "Bjud in till guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1851,9 +1851,9 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Flytta"
@@ -1862,8 +1862,8 @@ msgstr "Flytta"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Prata med"
 
@@ -1877,11 +1877,11 @@ msgstr "Prata med"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Köp"
 
@@ -1895,11 +1895,11 @@ msgstr "Köp"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Sälj"
 
@@ -1907,26 +1907,26 @@ msgstr "Sälj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "Ta bort från attacklistan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "Lägg till i prioriteringslistan för attack"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "Lägg till i attacklistan"
 
@@ -1934,19 +1934,19 @@ 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:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "Lägg till i ignoreringslistan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr ""
 
@@ -1954,19 +1954,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr ""
 
@@ -1974,7 +1974,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1991,14 +1991,14 @@ msgstr "Unequip"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Ändra namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr ""
 
@@ -2006,38 +2006,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "Lägg till namnet i chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "Kicka från party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "Pick up"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "Kartobjekt"
 
@@ -2047,22 +2047,22 @@ msgstr "Kartobjekt"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Warpa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr "Rör kamera"
 
@@ -2071,7 +2071,7 @@ msgstr "Rör kamera"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2079,69 +2079,69 @@ msgstr "Utstyrsel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr "Rensa klädsel"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr "Ändra spell"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Clear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "Inaktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "Aktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr "Ta inte bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "Ta bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "Aktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "Avaktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Lämna"
 
@@ -2151,84 +2151,84 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "Ändra guild-position"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "Döp om kartskyltar       "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "Namn:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr "Lägg till för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr "Lägg till 10 för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr "Lägg till hälften för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr "Lägg till trade alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr "Lägg till alla för trade"
 
@@ -2237,8 +2237,8 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2246,64 +2246,63 @@ msgstr "Lagra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "Lagra 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Lagra hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr "Lagra alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Lagra alla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "Flytta till Target"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Ta emot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Hämta ut 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Hämta ut hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr "Hämta ut alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Hämta ut alla"
 
@@ -2314,56 +2313,56 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 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:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2371,30 +2370,30 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr "Visa fönster"
 
@@ -2402,7 +2401,7 @@ msgstr "Visa fönster"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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
@@ -2411,135 +2410,135 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 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:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 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:2518
+#: src/gui/popups/popupmenu.cpp:2516
 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:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -2547,70 +2546,70 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Släng"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr "Sparka"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "Flytta till Target"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3056,7 +3055,7 @@ msgstr "Ändra"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -3127,30 +3126,30 @@ msgid "Battle"
 msgstr "Battle"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Global announcement:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Global announcement from %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s viskar: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr "%s är nu Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s är nu Offline."
@@ -4175,7 +4174,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr "okänd"
 
@@ -5582,7 +5581,7 @@ msgstr "QE"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Uppdrag"
 
@@ -5668,7 +5667,7 @@ msgstr "SKI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Skills"
 
@@ -6919,42 +6918,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "Upp"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Skill points tillgängliga: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Skill Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -7645,9 +7644,9 @@ msgstr ""
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "Klädsel-genväg %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9055,7 +9054,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "Okänt item"
 
@@ -9326,157 +9325,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "Inte namngiven"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr "Attack %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr "Defense %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr "HP %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr "MP %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr "Level %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""
 
@@ -10457,6 +10456,3 @@ msgstr "%d sekund"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
-
-#~ msgid "Client too old."
-#~ msgstr "Klienten är uråldrig."
diff --git a/po/sv_SE.po b/po/sv_SE.po
index edbcafe7c..e97998d7c 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
 "language/sv_SE/)\n"
@@ -128,7 +128,7 @@ msgstr "Guild-namn saknas."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Var vänlig specificera ett namn."
 
@@ -158,91 +158,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Spelare är redan %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Spelare %s lyckades!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Spelare kunde inte bli %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Spelaren ignorerades inte!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Spelaren är inte längre ignorerad!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Spelaren kunde inte bli oignorerad!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Spelare är redan borttagen!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Spelaren kunde inte tas bort!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "vän"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "ignorera"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "neutral"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "blacklistad"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "enemy"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -415,8 +415,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -500,13 +500,13 @@ msgstr "Hjälp"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Stäng"
 
@@ -1213,7 +1213,7 @@ msgstr "Meddelande"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr "Återuppliva"
 
@@ -1397,8 +1397,8 @@ msgstr "Skitstor (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1723,21 +1723,21 @@ msgstr "Skapa Party"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1772,7 +1772,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1787,8 +1787,8 @@ msgstr "Trade"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1800,41 +1800,41 @@ msgstr "Attackera"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "Viska"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "Hela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "Kicka från guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "Ändra position i guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "Bjud in till guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1851,9 +1851,9 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Flytta"
@@ -1862,8 +1862,8 @@ msgstr "Flytta"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Prata med"
 
@@ -1877,11 +1877,11 @@ msgstr "Prata med"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Köp"
 
@@ -1895,11 +1895,11 @@ msgstr "Köp"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Sälj"
 
@@ -1907,26 +1907,26 @@ msgstr "Sälj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "Ta bort från attacklistan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "Lägg till i prioriteringslistan för attack"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "Lägg till i attacklistan"
 
@@ -1934,19 +1934,19 @@ 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:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "Lägg till i ignoreringslistan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr ""
 
@@ -1954,19 +1954,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr ""
 
@@ -1974,7 +1974,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1991,14 +1991,14 @@ msgstr "Unequip"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Ändra namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr ""
 
@@ -2006,38 +2006,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "Lägg till namnet i chat"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "Kicka från party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "Pick up"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "Kartobjekt"
 
@@ -2047,22 +2047,22 @@ msgstr "Kartobjekt"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Warpa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr "Rör kamera"
 
@@ -2071,7 +2071,7 @@ msgstr "Rör kamera"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2079,69 +2079,69 @@ msgstr "Utstyrsel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr "Rensa klädsel"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr "Ändra spell"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Clear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "Inaktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "Aktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr "Ta inte bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "Ta bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "Aktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "Avaktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Lämna"
 
@@ -2151,84 +2151,84 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "Ändra guild-position"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "Döp om kartskyltar       "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "Namn:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr "Lägg till för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr "Lägg till 10 för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr "Lägg till hälften för trade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr "Lägg till trade alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr "Lägg till alla för trade"
 
@@ -2237,8 +2237,8 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2246,64 +2246,63 @@ msgstr "Lagra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "Lagra 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Lagra hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr "Lagra alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Lagra alla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "Flytta till Target"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Ta emot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Hämta ut 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Hämta ut hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr "Hämta ut alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Hämta ut alla"
 
@@ -2314,56 +2313,56 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 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:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2371,30 +2370,30 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr "Visa fönster"
 
@@ -2402,7 +2401,7 @@ msgstr "Visa fönster"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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
@@ -2411,135 +2410,135 @@ msgstr "Level: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 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:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 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:2518
+#: src/gui/popups/popupmenu.cpp:2516
 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:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -2547,70 +2546,70 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Släng"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr "Granska ip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr "Goto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr "Sparka"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "Flytta till Target"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3056,7 +3055,7 @@ msgstr "Ändra"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
@@ -3127,30 +3126,30 @@ msgid "Battle"
 msgstr "Battle"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Global announcement:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Global announcement from %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s viskar: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr "%s är nu Online."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s är nu Offline."
@@ -4175,7 +4174,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr "okänd"
 
@@ -5582,7 +5581,7 @@ msgstr "QE"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Uppdrag"
 
@@ -5668,7 +5667,7 @@ msgstr "SKI"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Skills"
 
@@ -6919,42 +6918,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "Upp"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Skill points tillgängliga: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Skill Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -7645,9 +7644,9 @@ msgstr ""
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "Klädsel-genväg %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9055,7 +9054,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "Okänt item"
 
@@ -9326,157 +9325,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "Inte namngiven"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr "Attack %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr "Defense %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr "HP %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr "MP %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr "Level %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""
 
@@ -10457,6 +10456,3 @@ msgstr "%d sekund"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
-
-#~ msgid "Client too old."
-#~ msgstr "Klienten är uråldrig."
diff --git a/po/tr.po b/po/tr.po
index e0d90b925..8164d2700 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
 "tr/)\n"
@@ -130,7 +130,7 @@ msgstr "Guild adı eksik."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Lütfen bir isim belirtin."
 
@@ -160,91 +160,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Oyuncu zaten %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Oyuncu başarı ile %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Oyuncu %s yapılamadı!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Oyuncu görmezden gelinmiyordu!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Oyuncu daha fazla görmezden gelinmiyor!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Oyuncuyu görmezden gelme geri alınamadı!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Oyuncu zaten silindi!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Oyuncu geri alındı!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Oyuncu silinemedi!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "arkadaş"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "ihmal edilmiş"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "nötr"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "kara listeye alınmış"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "düşman"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -417,8 +417,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "Tamamen görmezden gel"
 
@@ -502,13 +502,13 @@ msgstr "Yardım"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Kapat"
 
@@ -1212,7 +1212,7 @@ msgstr "Mesaj"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr "Dirilt"
 
@@ -1400,8 +1400,8 @@ msgstr "Kocaman (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(varsayılan)"
 
@@ -1726,21 +1726,21 @@ msgstr "Parti kur"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1775,7 +1775,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1790,8 +1790,8 @@ msgstr "Takas"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1803,41 +1803,41 @@ msgstr "Saldırı"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "Fısıltı"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "İyileş"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "Guild'den at"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "Guild'deki pozisyonunu değiştir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "Guild'e davet et"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1854,9 +1854,9 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Taşı"
@@ -1865,8 +1865,8 @@ msgstr "Taşı"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Konuş"
 
@@ -1880,11 +1880,11 @@ msgstr "Konuş"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Satın Al"
 
@@ -1898,11 +1898,11 @@ msgstr "Satın Al"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Sat"
 
@@ -1910,26 +1910,26 @@ msgstr "Sat"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr "Yorum ekle"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "Saldırı listesinden kaldır"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "Öncelikli saldırı listesine ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "Saldırı listesine ekle"
 
@@ -1937,19 +1937,19 @@ 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:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "Gözmezden gelinenler listesine ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr "Sahibe git"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr "Kov"
 
@@ -1957,19 +1957,19 @@ msgstr "Kov"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr "Besle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr "Öldür"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr "Ganimet bırak"
 
@@ -1977,7 +1977,7 @@ msgstr "Ganimet bırak"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1994,14 +1994,14 @@ msgstr "Çıkar"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Yeniden adlandır"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr "Yumurtaya dön"
 
@@ -2009,38 +2009,38 @@ msgstr "Yumurtaya dön"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "Sohbete isim ekle"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Oyuncular"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "Partiden at"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "Topla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Sohbete ekle"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "Harita itemi"
 
@@ -2050,22 +2050,22 @@ msgstr "Harita itemi"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "Kaldır"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Dönüştür"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr "Hareket kamerası"
 
@@ -2074,7 +2074,7 @@ msgstr "Hareket kamerası"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2082,69 +2082,69 @@ msgstr "Kıyafetler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr "Kıyafetlerin hepsini çıkart"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Büyüler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 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:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Temizle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "Vurgulamayı kapat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "Vurgulamayı aç"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr "İsimleri kaldırma"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "AFK aç"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Ayrıl"
 
@@ -2154,84 +2154,84 @@ msgstr "Ayrıl"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr "Panoya kopyala"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "Guild pozisyonunu değiştir"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr "pencere"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr "Kilidi aç"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr "Kilitle"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "Harita işaretini tekrar adlandır "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "İsim:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Oyuncu yorumu             "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Yorum:                        "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr "Takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr "10 tanesini takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr "Yarısını takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr "Tamamını takasa ekle-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr "Tamamını takasa ekle"
 
@@ -2240,8 +2240,8 @@ msgstr "Tamamını takasa ekle"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2249,64 +2249,63 @@ msgstr "Sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "Sakla 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Yarısını sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr "Tamamını sakla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Tamamını sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "Sahibe git"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Geri al"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Geri al 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Yarısını geri al"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr "Tamamını geri al-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Tamamını geri al"
 
@@ -2317,56 +2316,56 @@ msgstr "Tamamını geri al"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "Kullan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr ""
 
@@ -2374,30 +2373,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr ""
 
@@ -2405,7 +2404,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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
@@ -2414,135 +2413,135 @@ msgstr "Seviye: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 msgid "Disregard"
 msgstr "İhmal et"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 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:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "Görmezden gelmeyi bırak"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "Satın Al (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "Gruba davet et"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "Nesneleri göster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr "Toplama listesinden kaldır"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 msgid "Add to pickup list"
 msgstr "Toplama listesine ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Bırak..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr ""
 
@@ -2550,70 +2549,70 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Bırak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "Sahibe git"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3059,7 +3058,7 @@ msgstr "Dünzenle"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
@@ -3130,30 +3129,30 @@ msgid "Battle"
 msgstr "Savaş"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Global duyuru:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s'ten Küresel duyuru:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s %s'e fısıldıyor:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4179,7 +4178,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr ""
 
@@ -5581,7 +5580,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
@@ -5667,7 +5666,7 @@ msgstr "YTN"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Yetenekler"
 
@@ -6911,42 +6910,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "Yukarı"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Mevcut yetenek puanları: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Yetenek Seti %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Yetenek %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -7637,9 +7636,9 @@ msgstr ""
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "Nesne Kısayolu %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9042,7 +9041,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "Bilinmeyen nesne"
 
@@ -9313,157 +9312,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "isimsiz"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 24f70c6ca..d322bef78 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
 "uk/)\n"
@@ -133,7 +133,7 @@ msgstr "Не вистачає назви гільдії."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "Будь ласка, вкажіть гравця."
 
@@ -163,91 +163,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "Гравця все позначено як \"%s\"!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "Гравця позначено як \"%s\"!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "Неможливо позначити гравця як \"%s\"!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "Гравець не ігнорувався!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "Гравець більше не ігнорується!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "Не можна видалити цього гравця зі списку ігнорованих!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "Гравець все стертий!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "Гравця повернуто із порожнечі!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "Не можна повернути цього стертого гравця!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "приятель"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "зневажити"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "нейтральний"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "чорний список"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "супротивник"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -421,8 +421,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "Остаточно ігнорувати"
 
@@ -506,13 +506,13 @@ msgstr "Довідка"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "Закрити"
 
@@ -1218,7 +1218,7 @@ msgstr "Повідомлення"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr "Опритомнити"
 
@@ -1404,8 +1404,8 @@ msgstr "Величезний (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(за замовчуванням)"
 
@@ -1730,21 +1730,21 @@ msgstr "Створити групу"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1779,7 +1779,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1794,8 +1794,8 @@ msgstr "Торгівля"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1807,41 +1807,41 @@ msgstr "Атака"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "Шепіт"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "Вилікувати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "Виштовхати з гільдії"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "Змінити позицію в гільдії"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "Запросити до гільдії"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "Знищити"
 
@@ -1858,9 +1858,9 @@ msgstr "Знищити"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "Рух"
@@ -1869,8 +1869,8 @@ msgstr "Рух"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "Діалог"
 
@@ -1884,11 +1884,11 @@ msgstr "Діалог"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "Придбати"
 
@@ -1902,11 +1902,11 @@ msgstr "Придбати"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "Продати"
 
@@ -1914,26 +1914,26 @@ msgstr "Продати"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr "Додати примітку"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "Видалити зі списку атаки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "Додати до пріоритетного списку атаки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "Додати до списку атаки"
 
@@ -1941,19 +1941,19 @@ msgstr "Додати до списку атаки"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "Ігнорувати тип мобу"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr "Наблизити до власника"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr "Атакувати"
 
@@ -1961,19 +1961,19 @@ msgstr "Атакувати"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr "Нагодувати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr "Вбити"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr "Скинути дропи"
 
@@ -1981,7 +1981,7 @@ msgstr "Скинути дропи"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1998,14 +1998,14 @@ msgstr "Зняти"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "Перейменувати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr "Повернути до яйця"
 
@@ -2013,38 +2013,38 @@ msgstr "Повернути до яйця"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "Додати ім'я до чату"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "Гравці"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "Виштовхати з групи"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "Підняти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "Додати до чату"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "Елемент карти"
 
@@ -2054,22 +2054,22 @@ msgstr "Елемент карти"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "Видалити"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "Телепорт"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr "Рухати камеру"
 
@@ -2078,7 +2078,7 @@ msgstr "Рухати камеру"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2086,69 +2086,69 @@ msgstr "Швидке спорядження"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr "Видалити швидке спорядження"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Заклинання"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr "Редагувати заклинання"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "Скинути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "Вимкнути підсвічування"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "Увімкнути підсвічування"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr "Не приховувати ім'я"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "Приховати ім'я"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "Дозволити режим \"Відсутній\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "Заборонити режим \"Відсутній\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "Залишити"
 
@@ -2158,84 +2158,84 @@ msgstr "Залишити"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr "Внести в буфер обміну"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "Змінити позицію в гільдії"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr "вікно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr "Відімкнути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr "Зафіксувати"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "Перейменувати            "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "Ім'я:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "Примітка до гравця        "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "Примітка:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr "Додати до торгівлі"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr "Додати до торгівлі 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr "Додати половину до торгівлі"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr "Додати все окрім одного"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr "Додати всю кількість"
 
@@ -2244,8 +2244,8 @@ msgstr "Додати всю кількість"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2253,64 +2253,63 @@ msgstr "Зберегти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "Зберегти 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "Зберегти половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr "Зберегти все окрім одного"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "Зберегти всю кількість"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "Наблизити до власника"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "Вилучити"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "Вилучити 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "Вилучити половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr "Вилучити все окрім одного"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "Вилучити всю кількість"
 
@@ -2321,56 +2320,56 @@ msgstr "Вилучити всю кількість"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "Використати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr "Скинути значення комірців"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "Сховати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "Показати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Reset yellow bar"
 msgstr "Скинути Жовтий рядок"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "Пріоритет вище"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr "Пріоритет нижче"
 
@@ -2378,30 +2377,30 @@ msgstr "Пріоритет нижче"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr "Роздягнути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr "Копіювати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr "Вставити"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr "Відвідати посилання"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr "Показати вікно"
 
@@ -2409,7 +2408,7 @@ msgstr "Показати вікно"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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 +2417,135 @@ msgstr "Рівень: %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 msgid "Disregard"
 msgstr "Зневажати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ігнорувати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr "В чорний список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr "Позначити супротивником"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr "Стерти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "Приятелювати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "Повернути з ігнору"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "Іти слідом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "Купувати (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "Продати (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "Запросити до групи"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr "Ввійти до чату %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "Показати спорядження"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr "Видалити зі списку підбирання"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 msgid "Add to pickup list"
 msgstr "Додати до списку підбирання"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr "Зняти захист"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr "Захистити предмет"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "Кинути..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "Кинути все"
 
@@ -2554,70 +2553,70 @@ msgstr "Кинути все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "Кинути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr "ГМ команди"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr "Перевірити IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr "Відвідати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr "Викликати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr "Виштовхати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "Наблизити до власника"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3063,7 +3062,7 @@ msgstr "Редагувати"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "Рівень: %d"
@@ -3134,30 +3133,30 @@ msgid "Battle"
 msgstr "Бій"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "Глобальне повідомлення:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Глобальне повідомлення від %s:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s шепоче: %s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr "%s з'явився онлайн."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr "%s вийшов з гри."
@@ -4182,7 +4181,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr "невідоме"
 
@@ -5589,7 +5588,7 @@ msgstr "КВ"
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr "Квести"
 
@@ -5675,7 +5674,7 @@ msgstr "ВМІ"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "Вміння"
 
@@ -6926,42 +6925,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "Вище"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Балів вмінь: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr "Група вмінь %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "Вміння %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Невдале вміння: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -7650,9 +7649,9 @@ msgstr "Показувати смайлики (режим балачки)"
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "Клавіша спорядження %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9057,7 +9056,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "Невідомий предмет"
 
@@ -9328,157 +9327,157 @@ msgstr "Новітній OpenGL"
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "казна що"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr "Атака %s"
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr "Критична атака %s"
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr "Магічна атака %s"
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr "Захист %s"
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr "Критичний захист %s"
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr "Магічний захист %s"
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr "Здоров'я %s"
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr "Мана %s"
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr "Рівень: %s"
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr "Швидкість %s"
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr "Відстань %s"
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr "Ухилення %s"
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr "улюбленець"
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""
 
@@ -10459,6 +10458,3 @@ msgstr "%d секунда"
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
-
-#~ msgid "Client too old."
-#~ msgstr "Клієнт застарий."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0f402e69d..30b463d6d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_CN/)\n"
@@ -135,7 +135,7 @@ msgstr "公会名称缺失."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "请指定一个名称."
 
@@ -165,91 +165,91 @@ msgid "equipped hat %s."
 msgstr ""
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "玩家已经%s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "玩家成功%s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "玩家不能为 %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "玩家没有被忽视!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽视!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "不能取消对玩家的忽视!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "玩家已经被删除!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "无法删除玩家!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "朋友"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "无视"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "中立"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr ""
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr ""
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr ""
@@ -421,8 +421,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -506,13 +506,13 @@ msgstr "帮助"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "关闭"
 
@@ -1216,7 +1216,7 @@ msgstr "讯息"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr ""
 
@@ -1400,8 +1400,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1726,21 +1726,21 @@ msgstr "建立"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1775,7 +1775,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1790,8 +1790,8 @@ msgstr "交易"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1803,41 +1803,41 @@ msgstr "攻击"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "密语"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "愈合"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "踢从公会"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr ""
 
@@ -1854,9 +1854,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "移动"
@@ -1865,8 +1865,8 @@ msgstr "移动"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "说话"
 
@@ -1880,11 +1880,11 @@ msgstr "说话"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "购买"
 
@@ -1898,11 +1898,11 @@ msgstr "购买"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "出售"
 
@@ -1910,26 +1910,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr "发表评论"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "优先攻击列表"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "加入攻击清单"
 
@@ -1937,19 +1937,19 @@ msgstr "加入攻击清单"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr ""
 
@@ -1957,19 +1957,19 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr ""
 
@@ -1977,7 +1977,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1994,14 +1994,14 @@ msgstr "卸下装备"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "重命名"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr ""
 
@@ -2009,38 +2009,38 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "踢从党"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "拾取"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "加入聊天"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "地图项"
 
@@ -2050,22 +2050,22 @@ msgstr "地图项"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr ""
 
@@ -2074,7 +2074,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2082,69 +2082,69 @@ msgstr "套装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "法术"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "清除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "禁用"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "启用突出"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "移除姓名"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "启用远"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "留下"
 
@@ -2154,84 +2154,84 @@ msgstr "留下"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "重命名的地图标志          "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "名称：                   "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "玩家评论                  "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "评论：                       "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr ""
 
@@ -2240,8 +2240,8 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2249,64 +2249,63 @@ msgstr "存储"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "商店10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "商店的一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "商店所有"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "移动到目标"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "取回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "拿出10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "拿出一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "检索所有"
 
@@ -2317,56 +2316,56 @@ msgstr "检索所有"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "隐藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "显示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "x"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr ""
 
@@ -2374,30 +2373,30 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr ""
 
@@ -2405,7 +2404,7 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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
@@ -2414,135 +2413,135 @@ msgstr "等级：%d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "是朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "按照"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "购买(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "出售(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "显示项目"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "掉落..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "所有"
 
@@ -2550,70 +2549,70 @@ msgstr "所有"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "丢弃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "移动到目标"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3059,7 +3058,7 @@ msgstr "编辑"
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr "等级: %d"
@@ -3130,30 +3129,30 @@ msgid "Battle"
 msgstr "战斗"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "全局公告:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "%s 全局公告:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s私语:%s"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4176,7 +4175,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr ""
 
@@ -5578,7 +5577,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
@@ -5664,7 +5663,7 @@ msgstr "技能"
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "技能"
 
@@ -6906,42 +6905,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "升级"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr "技能点：%d个"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr "技能为%d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -7630,9 +7629,9 @@ msgstr ""
 #: src/input/pages/craft.cpp:56 src/input/pages/craft.cpp:62
 #: src/input/pages/craft.cpp:68 src/input/pages/craft.cpp:74
 #: src/input/pages/craft.cpp:80
-#, fuzzy, c-format
+#, c-format
 msgid "Craft shortcut %d"
-msgstr "物品快捷 %d"
+msgstr ""
 
 #. TRANSLATORS: input action name
 #: src/input/pages/emotes.cpp:35
@@ -9037,7 +9036,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr "未知物品"
 
@@ -9308,157 +9307,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr "未知怪兽"
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""
 
@@ -10437,6 +10436,3 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr ""
-
-#~ msgid "Client too old."
-#~ msgstr "客户端太旧."
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 7c6f43ad2..d0ed4be47 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-01-29 16:32+0300\n"
-"PO-Revision-Date: 2016-01-17 09:15+0000\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"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
 "language/zh_HK/)\n"
@@ -129,7 +129,7 @@ msgstr "欠缺公會名稱."
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
 #: src/actions/chat.cpp:377 src/actions/chat.cpp:408 src/actions/chat.cpp:480
-#: src/actions/chat.cpp:515 src/actions/commands.cpp:94
+#: src/actions/chat.cpp:515 src/actions/commands.cpp:90
 msgid "Please specify a name."
 msgstr "請指定一個名字."
 
@@ -159,91 +159,91 @@ msgid "equipped hat %s."
 msgstr "已準備帽子 %s."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:137
+#: src/actions/commands.cpp:133
 #, c-format
 msgid "Player already %s!"
 msgstr "玩家已經 %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:150
+#: src/actions/commands.cpp:146
 #, c-format
 msgid "Player successfully %s!"
 msgstr "玩家成功 %s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:152
+#: src/actions/commands.cpp:148
 #, c-format
 msgid "Player could not be %s!"
 msgstr "玩家不能被 %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:187
+#: src/actions/commands.cpp:183
 msgid "Player wasn't ignored!"
 msgstr "玩家沒有被忽略!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:196
+#: src/actions/commands.cpp:192
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽略!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:198
+#: src/actions/commands.cpp:194
 msgid "Player could not be unignored!"
 msgstr "玩家不能被忽略!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:213
+#: src/actions/commands.cpp:209
 msgid "Player already erased!"
 msgstr "玩家已經擦去!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:226
+#: src/actions/commands.cpp:222
 msgid "Player no longer erased!"
 msgstr "玩家不再被擦去!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:228
+#: src/actions/commands.cpp:224
 msgid "Player could not be erased!"
 msgstr "玩家不能被擦去!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:235
+#: src/actions/commands.cpp:231
 msgid "friend"
 msgstr "朋友"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:242
+#: src/actions/commands.cpp:238
 msgid "disregarded"
 msgstr "被忽略"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:249
+#: src/actions/commands.cpp:245
 msgid "neutral"
 msgstr "中立"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:256
+#: src/actions/commands.cpp:252
 msgid "blacklisted"
 msgstr "被列入黑名單"
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:263
+#: src/actions/commands.cpp:259
 msgid "enemy"
 msgstr "冤家"
 
 #. TRANSLATORS: quick mail message caption
-#: src/actions/commands.cpp:542
+#: src/actions/commands.cpp:537
 msgid "Quick message"
 msgstr ""
 
 #. TRANSLATORS: result from command /confget
-#: src/actions/commands.cpp:1056
+#: src/actions/commands.cpp:1051
 #, c-format
 msgid "Config value: %s"
 msgstr "配置數值:%s"
 
 #. TRANSLATORS: result from command /serverconfget
-#: src/actions/commands.cpp:1069
+#: src/actions/commands.cpp:1064
 #, c-format
 msgid "Server config value: %s"
 msgstr "伺服器配置數值:%s"
@@ -415,8 +415,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:2318
-#: src/gui/popups/popupmenu.cpp:2360
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2316
+#: src/gui/popups/popupmenu.cpp:2358
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -500,13 +500,13 @@ msgstr "說明"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:850 src/client.cpp:1420 src/client.cpp:1439
 #: src/dyetool/client.cpp:497 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:682 src/gui/popups/popupmenu.cpp:759
-#: src/gui/popups/popupmenu.cpp:1003 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:680 src/gui/popups/popupmenu.cpp:757
+#: src/gui/popups/popupmenu.cpp:1001 src/gui/windows/didyouknowwindow.cpp:81
 #: 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/questswindow.cpp:79 src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/questswindow.cpp:78 src/gui/windows/shopwindow.cpp:114
 msgid "Close"
 msgstr "關閉"
 
@@ -1210,7 +1210,7 @@ msgstr "訊息"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2649
 msgid "Revive"
 msgstr "復活"
 
@@ -1394,8 +1394,8 @@ msgstr "巨型 (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: 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
+#: 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
 msgid "(default)"
 msgstr "(默認)"
 
@@ -1720,21 +1720,21 @@ msgstr "選擇隊伍"
 #. TRANSLATORS: unregister dialog. button.
 #. TRANSLATORS: updater window button
 #. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:393
-#: src/gui/popups/popupmenu.cpp:461 src/gui/popups/popupmenu.cpp:562
-#: src/gui/popups/popupmenu.cpp:611 src/gui/popups/popupmenu.cpp:646
-#: src/gui/popups/popupmenu.cpp:687 src/gui/popups/popupmenu.cpp:712
-#: src/gui/popups/popupmenu.cpp:737 src/gui/popups/popupmenu.cpp:926
-#: src/gui/popups/popupmenu.cpp:953 src/gui/popups/popupmenu.cpp:989
-#: src/gui/popups/popupmenu.cpp:1715 src/gui/popups/popupmenu.cpp:1754
-#: src/gui/popups/popupmenu.cpp:1810 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/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:391
+#: src/gui/popups/popupmenu.cpp:459 src/gui/popups/popupmenu.cpp:560
+#: src/gui/popups/popupmenu.cpp:609 src/gui/popups/popupmenu.cpp:644
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:710
+#: 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/windows/changeemaildialog.cpp:56
 #: src/gui/windows/changepassworddialog.cpp:58
 #: src/gui/windows/charcreatedialog.cpp:112
@@ -1769,7 +1769,7 @@ msgstr "卡片： "
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:832
+#: src/gui/popups/popupmenu.cpp:165 src/gui/popups/popupmenu.cpp:830
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:342
 msgid "Trade"
@@ -1784,8 +1784,8 @@ msgstr "交易"
 #. TRANSLATORS: Skill type
 #. TRANSLATORS: input action name
 #. TRANSLATORS: player stat
-#: src/gui/popups/popupmenu.cpp:170 src/gui/popups/popupmenu.cpp:292
-#: src/gui/popups/popupmenu.cpp:835 src/gui/widgets/skillinfo.cpp:125
+#: src/gui/popups/popupmenu.cpp:168 src/gui/popups/popupmenu.cpp:290
+#: src/gui/popups/popupmenu.cpp:833 src/gui/widgets/skillinfo.cpp:125
 #: src/input/pages/basic.cpp:40 src/net/eathena/generalhandler.cpp:241
 #: src/net/tmwa/generalhandler.cpp:251
 msgid "Attack"
@@ -1797,41 +1797,41 @@ msgstr "攻擊"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:173 src/gui/popups/popupmenu.cpp:265
-#: src/gui/popups/popupmenu.cpp:482
+#: src/gui/popups/popupmenu.cpp:171 src/gui/popups/popupmenu.cpp:263
+#: src/gui/popups/popupmenu.cpp:480
 msgid "Whisper"
 msgstr "悄悄話"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:839
+#: src/gui/popups/popupmenu.cpp:177 src/gui/popups/popupmenu.cpp:837
 msgid "Heal"
 msgstr "療癒"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:199 src/gui/popups/popupmenu.cpp:215
-#: src/gui/popups/popupmenu.cpp:531 src/gui/popups/popupmenu.cpp:867
+#: src/gui/popups/popupmenu.cpp:197 src/gui/popups/popupmenu.cpp:213
+#: src/gui/popups/popupmenu.cpp:529 src/gui/popups/popupmenu.cpp:865
 msgid "Kick from guild"
 msgstr "從公會踢出"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:206 src/gui/popups/popupmenu.cpp:222
-#: src/gui/popups/popupmenu.cpp:538 src/gui/popups/popupmenu.cpp:874
+#: src/gui/popups/popupmenu.cpp:204 src/gui/popups/popupmenu.cpp:220
+#: src/gui/popups/popupmenu.cpp:536 src/gui/popups/popupmenu.cpp:872
 msgid "Change pos in guild"
 msgstr "更改公會職位"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:235 src/gui/popups/popupmenu.cpp:550
-#: src/gui/popups/popupmenu.cpp:888
+#: src/gui/popups/popupmenu.cpp:233 src/gui/popups/popupmenu.cpp:548
+#: src/gui/popups/popupmenu.cpp:886
 msgid "Invite to guild"
 msgstr "邀請至公會"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player invisible for self by id
-#: src/gui/popups/popupmenu.cpp:242
+#: src/gui/popups/popupmenu.cpp:240
 msgid "Nuke"
 msgstr "清除"
 
@@ -1848,9 +1848,9 @@ msgstr "清除"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:278
-#: src/gui/popups/popupmenu.cpp:512 src/gui/popups/popupmenu.cpp:674
-#: src/gui/popups/popupmenu.cpp:846 src/gui/popups/popupmenu.cpp:911
+#: src/gui/popups/popupmenu.cpp:243 src/gui/popups/popupmenu.cpp:276
+#: src/gui/popups/popupmenu.cpp:510 src/gui/popups/popupmenu.cpp:672
+#: src/gui/popups/popupmenu.cpp:844 src/gui/popups/popupmenu.cpp:909
 #: src/gui/setupinputpages.cpp:46
 msgid "Move"
 msgstr "移動"
@@ -1859,8 +1859,8 @@ msgstr "移動"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:259 src/input/pages/basic.cpp:88
-#: src/resources/db/npcdb.cpp:151
+#: src/gui/popups/popupmenu.cpp:257 src/input/pages/basic.cpp:88
+#: src/resources/db/npcdb.cpp:150
 msgid "Talk"
 msgstr "對話"
 
@@ -1874,11 +1874,11 @@ msgstr "對話"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:269 src/gui/popups/popupmenu.cpp:2390
+#: src/gui/popups/popupmenu.cpp:267 src/gui/popups/popupmenu.cpp:2388
 #: 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:153
+#: src/input/pages/basic.cpp:244 src/resources/db/npcdb.cpp:152
 msgid "Buy"
 msgstr "購買"
 
@@ -1892,11 +1892,11 @@ msgstr "購買"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:272 src/gui/popups/popupmenu.cpp:2402
+#: src/gui/popups/popupmenu.cpp:270 src/gui/popups/popupmenu.cpp:2400
 #: 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/resources/db/npcdb.cpp:155
+#: src/resources/db/npcdb.cpp:154
 msgid "Sell"
 msgstr "出售"
 
@@ -1904,26 +1904,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:281 src/gui/popups/popupmenu.cpp:492
-#: src/gui/popups/popupmenu.cpp:2500
+#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:490
+#: src/gui/popups/popupmenu.cpp:2498
 msgid "Add comment"
 msgstr "添加評論"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:304
+#: src/gui/popups/popupmenu.cpp:302
 msgid "Remove from attack list"
 msgstr "從攻擊清單中移除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:311
+#: src/gui/popups/popupmenu.cpp:309
 msgid "Add to priority attack list"
 msgstr "加至優先攻擊清單"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:315
+#: src/gui/popups/popupmenu.cpp:313
 msgid "Add to attack list"
 msgstr "加至攻擊列表"
 
@@ -1931,19 +1931,19 @@ msgstr "加至攻擊列表"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:319 src/gui/popups/popupmenu.cpp:2522
+#: src/gui/popups/popupmenu.cpp:317 src/gui/popups/popupmenu.cpp:2520
 msgid "Add to ignore list"
 msgstr "加至忽略列表"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:340
+#: src/gui/popups/popupmenu.cpp:327 src/gui/popups/popupmenu.cpp:338
 msgid "Move to master"
 msgstr "移動至主人"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:333
+#: src/gui/popups/popupmenu.cpp:331
 msgid "Fire"
 msgstr "開火"
 
@@ -1951,19 +1951,19 @@ msgstr "開火"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:343 src/gui/popups/popupmenu.cpp:356
+#: src/gui/popups/popupmenu.cpp:341 src/gui/popups/popupmenu.cpp:354
 msgid "Feed"
 msgstr "餵食"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: delete homunculus
-#: src/gui/popups/popupmenu.cpp:347
+#: src/gui/popups/popupmenu.cpp:345
 msgid "Kill"
 msgstr "殺死"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:359
+#: src/gui/popups/popupmenu.cpp:357
 msgid "Drop loot"
 msgstr "丟棄"
 
@@ -1971,7 +1971,7 @@ msgstr "丟棄"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:362 src/gui/windows/equipmentwindow.cpp:72
+#: src/gui/popups/popupmenu.cpp:360 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:208 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
@@ -1988,14 +1988,14 @@ msgstr "卸下裝備"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:631
+#: src/gui/popups/popupmenu.cpp:364 src/gui/popups/popupmenu.cpp:629
 #: src/gui/windows/charselectdialog.cpp:107 src/gui/windows/shopwindow.cpp:194
 msgid "Rename"
 msgstr "重新命名"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:370
+#: src/gui/popups/popupmenu.cpp:368
 msgid "Return to egg"
 msgstr "返回蛋裏"
 
@@ -2003,38 +2003,38 @@ msgstr "返回蛋裏"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:388 src/gui/popups/popupmenu.cpp:558
+#: src/gui/popups/popupmenu.cpp:386 src/gui/popups/popupmenu.cpp:556
 msgid "Add name to chat"
 msgstr "把名字加至對話"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:438 src/gui/widgets/tabs/setup_players.cpp:56
+#: src/gui/popups/popupmenu.cpp:436 src/gui/widgets/tabs/setup_players.cpp:56
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:504 src/gui/popups/popupmenu.cpp:2443
-#: src/gui/popups/popupmenu.cpp:2467
+#: src/gui/popups/popupmenu.cpp:502 src/gui/popups/popupmenu.cpp:2441
+#: src/gui/popups/popupmenu.cpp:2465
 msgid "Kick from party"
 msgstr "從隊伍踢出"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:593 src/gui/popups/popupmenu.cpp:602
+#: src/gui/popups/popupmenu.cpp:591 src/gui/popups/popupmenu.cpp:600
 msgid "Pick up"
 msgstr "拿起物品"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:607 src/gui/popups/popupmenu.cpp:1711
-#: src/gui/popups/popupmenu.cpp:1796 src/gui/popups/popupmenu.cpp:1840
+#: src/gui/popups/popupmenu.cpp:605 src/gui/popups/popupmenu.cpp:1709
+#: src/gui/popups/popupmenu.cpp:1794 src/gui/popups/popupmenu.cpp:1838
 msgid "Add to chat"
 msgstr "加至對話"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:628 src/gui/popups/popupmenu.cpp:664
+#: src/gui/popups/popupmenu.cpp:626 src/gui/popups/popupmenu.cpp:662
 msgid "Map Item"
 msgstr "地圖物件"
 
@@ -2044,22 +2044,22 @@ msgstr "地圖物件"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:634 src/gui/popups/popupmenu.cpp:2039
-#: src/gui/popups/popupmenu.cpp:2073
+#: src/gui/popups/popupmenu.cpp:632 src/gui/popups/popupmenu.cpp:2037
+#: src/gui/popups/popupmenu.cpp:2071
 msgid "Remove"
 msgstr "清除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:641 src/gui/popups/popupmenu.cpp:670
+#: src/gui/popups/popupmenu.cpp:639 src/gui/popups/popupmenu.cpp:668
 #: src/net/eathena/skillrecv.cpp:355
 msgid "Warp"
 msgstr "傳送"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:677
+#: src/gui/popups/popupmenu.cpp:675
 msgid "Move camera"
 msgstr "移動鏡頭"
 
@@ -2068,7 +2068,7 @@ msgstr "移動鏡頭"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:701 src/gui/setupinputpages.cpp:56
+#: src/gui/popups/popupmenu.cpp:699 src/gui/setupinputpages.cpp:56
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:237
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2076,69 +2076,69 @@ msgstr "裝備"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:704
+#: src/gui/popups/popupmenu.cpp:702
 msgid "Clear outfit"
 msgstr "清除裝備"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:730 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:728 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "咒語"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:731
 msgid "Edit spell"
 msgstr "編輯咒語"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:764 src/gui/windows/npcdialog.cpp:123
+#: src/gui/popups/popupmenu.cpp:762 src/gui/windows/npcdialog.cpp:123
 msgid "Clear"
 msgstr "清除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:771
+#: src/gui/popups/popupmenu.cpp:769
 msgid "Disable highlight"
 msgstr "關閉高亮"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:777
+#: src/gui/popups/popupmenu.cpp:775
 msgid "Enable highlight"
 msgstr "開啟高亮"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:783
+#: src/gui/popups/popupmenu.cpp:781
 msgid "Don't remove name"
 msgstr "不要清除名字"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:789
+#: src/gui/popups/popupmenu.cpp:787
 msgid "Remove name"
 msgstr "清除名字"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:795
+#: src/gui/popups/popupmenu.cpp:793
 msgid "Enable away"
 msgstr "開啟暫離鍵盤"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:801
+#: src/gui/popups/popupmenu.cpp:799
 msgid "Disable away"
 msgstr "關閉暫離鍵盤"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
 #. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:808 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:806 src/gui/windows/socialwindow.cpp:81
 msgid "Leave"
 msgstr "離開"
 
@@ -2148,84 +2148,84 @@ msgstr "離開"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:813 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2188
+#: src/gui/popups/popupmenu.cpp:811 src/gui/popups/popupmenu.cpp:2142
+#: src/gui/popups/popupmenu.cpp:2186
 msgid "Copy to clipboard"
 msgstr "複製至剪貼板"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:935
+#: src/gui/popups/popupmenu.cpp:933
 msgid "Change guild position"
 msgstr "改變公會職位"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:983
+#: src/gui/popups/popupmenu.cpp:981
 msgid "window"
 msgstr "視窗"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1010
 msgid "Unlock"
 msgstr "解鎖"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1018
+#: src/gui/popups/popupmenu.cpp:1016
 msgid "Lock"
 msgstr "鎖定"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1068
+#: src/gui/popups/popupmenu.cpp:1066
 msgid "Rename map sign          "
 msgstr "清除地圖標誌             "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1071
+#: src/gui/popups/popupmenu.cpp:1069
 msgid "Name:                    "
 msgstr "名字:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1086
+#: src/gui/popups/popupmenu.cpp:1084
 msgid "Player comment            "
 msgstr "玩家評語                  "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1089
+#: src/gui/popups/popupmenu.cpp:1087
 msgid "Comment:                      "
 msgstr "評語:                         "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1589
+#: src/gui/popups/popupmenu.cpp:1587
 msgid "Add to trade"
 msgstr "加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1597
+#: src/gui/popups/popupmenu.cpp:1595
 msgid "Add to trade 10"
 msgstr "把 10 加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1602
+#: src/gui/popups/popupmenu.cpp:1600
 msgid "Add to trade half"
 msgstr "把 一半 加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1606
+#: src/gui/popups/popupmenu.cpp:1604
 msgid "Add to trade all-1"
 msgstr "把 全部-1 加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1610
+#: src/gui/popups/popupmenu.cpp:1608
 msgid "Add to trade all"
 msgstr "把 全部 加至交易"
 
@@ -2234,8 +2234,8 @@ msgstr "把 全部 加至交易"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1618 src/gui/popups/popupmenu.cpp:1792
-#: src/gui/popups/popupmenu.cpp:1835 src/gui/windows/inventorywindow.cpp:268
+#: 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/windows/inventorywindow.cpp:292
 #: src/gui/windows/inventorywindow.cpp:901 src/gui/windows/setupwindow.cpp:102
 msgid "Store"
@@ -2243,64 +2243,63 @@ msgstr "儲存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1626
+#: src/gui/popups/popupmenu.cpp:1624
 msgid "Store 10"
 msgstr "儲存 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1631
+#: src/gui/popups/popupmenu.cpp:1629
 msgid "Store half"
 msgstr "儲存 一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1635
+#: src/gui/popups/popupmenu.cpp:1633
 msgid "Store all-1"
 msgstr "儲存 全部-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1639
+#: src/gui/popups/popupmenu.cpp:1637
 msgid "Store all"
 msgstr "儲存 全部"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1653
-#, fuzzy
+#: src/gui/popups/popupmenu.cpp:1651
 msgid "Move to craft..."
-msgstr "移動至主人"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1663 src/gui/windows/inventorywindow.cpp:270
+#: src/gui/popups/popupmenu.cpp:1661 src/gui/windows/inventorywindow.cpp:270
 #: src/gui/windows/inventorywindow.cpp:294
 msgid "Retrieve"
 msgstr "取回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1671
+#: src/gui/popups/popupmenu.cpp:1669
 msgid "Retrieve 10"
 msgstr "取回 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1676
+#: src/gui/popups/popupmenu.cpp:1674
 msgid "Retrieve half"
 msgstr "取回 一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1680
+#: src/gui/popups/popupmenu.cpp:1678
 msgid "Retrieve all-1"
 msgstr "取回 全部-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1684
+#: src/gui/popups/popupmenu.cpp:1682
 msgid "Retrieve all"
 msgstr "取回 全部"
 
@@ -2311,56 +2310,56 @@ msgstr "取回 全部"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1748 src/gui/popups/popupmenu.cpp:2594
+#: src/gui/popups/popupmenu.cpp:1746 src/gui/popups/popupmenu.cpp:2592
 #: src/gui/windows/inventorywindow.cpp:206
-#: src/gui/windows/inventorywindow.cpp:788 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:339
-#: src/gui/windows/skilldialog.cpp:514 src/gui/windows/skilldialog.cpp:601
+#: src/gui/windows/inventorywindow.cpp:788 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
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1850
+#: src/gui/popups/popupmenu.cpp:1848
 msgid "Clear drop window"
 msgstr "清除掉下視窗"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1881 src/gui/popups/popupmenu.cpp:1942
+#: src/gui/popups/popupmenu.cpp:1879 src/gui/popups/popupmenu.cpp:1940
 msgid "Hide"
 msgstr "隱藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1888 src/gui/popups/popupmenu.cpp:1949
+#: src/gui/popups/popupmenu.cpp:1886 src/gui/popups/popupmenu.cpp:1947
 msgid "Show"
 msgstr "顯示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1956
+#: src/gui/popups/popupmenu.cpp:1954
 msgid "Open yellow bar settings"
 msgstr "開啟黃色欄設定"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:1958
+#: src/gui/popups/popupmenu.cpp:1956
 msgid "Reset yellow bar"
 msgstr "重設黃色欄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:1962 src/gui/windows/statuswindow.cpp:87
+#: src/gui/popups/popupmenu.cpp:1960 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:2002 src/gui/popups/popupmenu.cpp:2021
+#: src/gui/popups/popupmenu.cpp:2000 src/gui/popups/popupmenu.cpp:2019
 msgid "Move up"
 msgstr "往上移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2027
+#: src/gui/popups/popupmenu.cpp:2006 src/gui/popups/popupmenu.cpp:2025
 msgid "Move down"
 msgstr "往下移動"
 
@@ -2368,30 +2367,30 @@ msgstr "往下移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2102 src/gui/popups/popupmenu.cpp:2497
+#: src/gui/popups/popupmenu.cpp:2100 src/gui/popups/popupmenu.cpp:2495
 msgid "Undress"
 msgstr "脫衣"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2120
+#: src/gui/popups/popupmenu.cpp:2118
 msgid "Copy"
 msgstr "複製"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2123
+#: src/gui/popups/popupmenu.cpp:2121
 msgid "Paste"
 msgstr "貼上"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2141
+#: src/gui/popups/popupmenu.cpp:2139
 msgid "Open link"
 msgstr "開啟連結"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2159
+#: src/gui/popups/popupmenu.cpp:2157
 msgid "Show window"
 msgstr "顯示視窗"
 
@@ -2399,7 +2398,7 @@ msgstr "顯示視窗"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/popupmenu.cpp:2213 src/gui/popups/skillpopup.cpp:127
+#: src/gui/popups/popupmenu.cpp:2211 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
@@ -2408,135 +2407,135 @@ msgstr "等級:%d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2218
+#: src/gui/popups/popupmenu.cpp:2216
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2264 src/gui/popups/popupmenu.cpp:2300
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
+#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2298
+#: src/gui/popups/popupmenu.cpp:2337 src/gui/popups/popupmenu.cpp:2355
 msgid "Disregard"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2267 src/gui/popups/popupmenu.cpp:2303
-#: src/gui/popups/popupmenu.cpp:2342 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2265 src/gui/popups/popupmenu.cpp:2301
+#: src/gui/popups/popupmenu.cpp:2340 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2270 src/gui/popups/popupmenu.cpp:2345
+#: src/gui/popups/popupmenu.cpp:2268 src/gui/popups/popupmenu.cpp:2343
 msgid "Black list"
 msgstr "加至黑名單"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2273 src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2271 src/gui/popups/popupmenu.cpp:2304
 msgid "Set as enemy"
 msgstr "設為冤家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: 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
+#: 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
 msgid "Erase"
 msgstr "擦去"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2286
+#: src/gui/popups/popupmenu.cpp:2284
 msgid "Be friend"
 msgstr "設為朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: 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
+#: 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
 msgid "Unignore"
 msgstr "取消忽略"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2373
+#: src/gui/popups/popupmenu.cpp:2371
 msgid "Follow"
 msgstr "跟隨"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2377
+#: src/gui/popups/popupmenu.cpp:2375
 msgid "Imitate"
 msgstr "模仿"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2396 src/gui/popups/popupmenu.cpp:2420
+#: src/gui/popups/popupmenu.cpp:2394 src/gui/popups/popupmenu.cpp:2418
 msgid "Buy (?)"
 msgstr "購買 (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2408 src/gui/popups/popupmenu.cpp:2423
+#: src/gui/popups/popupmenu.cpp:2406 src/gui/popups/popupmenu.cpp:2421
 msgid "Sell (?)"
 msgstr "出售 (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2437 src/gui/popups/popupmenu.cpp:2461
+#: src/gui/popups/popupmenu.cpp:2435 src/gui/popups/popupmenu.cpp:2459
 msgid "Invite to party"
 msgstr "邀請至隊伍"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2483
 #, c-format
 msgid "Join chat %s"
 msgstr "加入對話 %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2492
 msgid "Show Items"
 msgstr "顯示物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2511
+#: src/gui/popups/popupmenu.cpp:2509
 msgid "Remove from pickup list"
 msgstr "從拾起清單中移除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2518
+#: src/gui/popups/popupmenu.cpp:2516
 msgid "Add to pickup list"
 msgstr "加至拾起清單"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2570
+#: src/gui/popups/popupmenu.cpp:2568
 msgid "Unprotect item"
 msgstr "取消保護物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2579
+#: src/gui/popups/popupmenu.cpp:2577
 msgid "Protect item"
 msgstr "保護物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2609 src/gui/windows/inventorywindow.cpp:221
+#: src/gui/popups/popupmenu.cpp:2607 src/gui/windows/inventorywindow.cpp:221
 #: src/gui/windows/inventorywindow.cpp:909
 msgid "Drop..."
 msgstr "丟棄..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2612
+#: src/gui/popups/popupmenu.cpp:2610
 msgid "Drop all"
 msgstr "丟棄全部"
 
@@ -2544,70 +2543,70 @@ msgstr "丟棄全部"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2618 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2616 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:914
 msgid "Drop"
 msgstr "丟棄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2629
+#: src/gui/popups/popupmenu.cpp:2627
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2637
+#: src/gui/popups/popupmenu.cpp:2635
 msgid "GM commands"
 msgstr "GM命令"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2642
+#: src/gui/popups/popupmenu.cpp:2640
 msgid "Check ip"
 msgstr "檢查IP"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: go to player position
-#: src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2643
 msgid "Goto"
 msgstr "到"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall player to current position
-#: src/gui/popups/popupmenu.cpp:2648
+#: src/gui/popups/popupmenu.cpp:2646
 msgid "Recall"
 msgstr "召回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player
-#: src/gui/popups/popupmenu.cpp:2656
+#: src/gui/popups/popupmenu.cpp:2654
 msgid "Kick"
 msgstr "踢走"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Mute %d"
 msgstr "靜音 %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: 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
+#: 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
 #, c-format
 msgid "Unmute %d"
 msgstr "取消靜音 %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:2724
-#, fuzzy, c-format
+#: src/gui/popups/popupmenu.cpp:2722
+#, c-format
 msgid "Move to craft %d"
-msgstr "移動至主人"
+msgstr ""
 
 #. TRANSLATORS: skill level
 #: src/gui/popups/skillpopup.cpp:118
@@ -3053,7 +3052,7 @@ msgstr ""
 
 #. TRANSLATORS: skill level
 #. TRANSLATORS: skills dialog. skill level
-#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:509
+#: src/gui/widgets/skillinfo.cpp:103 src/gui/windows/skilldialog.cpp:508
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
@@ -3124,30 +3123,30 @@ msgid "Battle"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:177
+#: src/gui/widgets/tabs/chat/chattab.cpp:173
 msgid "Global announcement:"
 msgstr "全服公告:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:183
+#: src/gui/widgets/tabs/chat/chattab.cpp:179
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "來自 %s 的全服公告:"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:209
+#: src/gui/widgets/tabs/chat/chattab.cpp:205
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:536
+#: src/gui/widgets/tabs/chat/chattab.cpp:532
 #, c-format
 msgid "%s is now Online."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/chat/chattab.cpp:542
+#: src/gui/widgets/tabs/chat/chattab.cpp:538
 #, c-format
 msgid "%s is now Offline."
 msgstr ""
@@ -4170,7 +4169,7 @@ msgstr ""
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
 #: src/gui/widgets/tabs/setup_input.cpp:333
-#: src/gui/windows/questswindow.cpp:206
+#: src/gui/windows/questswindow.cpp:205
 msgid "unknown"
 msgstr ""
 
@@ -5572,7 +5571,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for quests window.
 #. TRANSLATORS: quests window name
-#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:67
+#: src/gui/windowmenu.cpp:78 src/gui/windows/questswindow.cpp:66
 msgid "Quests"
 msgstr ""
 
@@ -5658,7 +5657,7 @@ msgstr ""
 
 #. TRANSLATORS: long button name for skills window.
 #. TRANSLATORS: skills dialog name
-#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:83
+#: src/gui/windowmenu.cpp:122 src/gui/windows/skilldialog.cpp:82
 msgid "Skills"
 msgstr "技能"
 
@@ -6900,42 +6899,42 @@ msgid "Personal Shop - %s"
 msgstr ""
 
 #. TRANSLATORS: skills dialog button
-#: src/gui/windows/skilldialog.cpp:93
+#: src/gui/windows/skilldialog.cpp:92
 msgid "Up"
 msgstr "升級"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:207
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:306
+#: src/gui/windows/skilldialog.cpp:305
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:327
+#: src/gui/windows/skilldialog.cpp:326
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:516
+#: src/gui/windows/skilldialog.cpp:515
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:810
+#: src/gui/windows/skilldialog.cpp:809
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:813
+#: src/gui/windows/skilldialog.cpp:812
 msgid "Text: "
 msgstr ""
 
@@ -9029,7 +9028,7 @@ msgstr ""
 #. TRANSLATORS: unknown item message
 #. TRANSLATORS: item name
 #: src/net/eathena/inventoryrecv.cpp:936 src/net/eathena/inventoryrecv.cpp:1069
-#: src/resources/db/itemdb.cpp:243
+#: src/resources/db/itemdb.cpp:242
 msgid "Unknown item"
 msgstr ""
 
@@ -9300,157 +9299,157 @@ msgstr ""
 #. TRANSLATORS: item info name
 #. TRANSLATORS: unknown info name
 #. TRANSLATORS: being info default name
-#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:91
-#: src/resources/db/itemdb.cpp:385 src/resources/db/moddb.cpp:79
-#: src/resources/db/monsterdb.cpp:102 src/resources/modinfo.cpp:29
+#: src/resources/beinginfo.cpp:55 src/resources/db/avatardb.cpp:90
+#: src/resources/db/itemdb.cpp:384 src/resources/db/moddb.cpp:78
+#: src/resources/db/monsterdb.cpp:101 src/resources/modinfo.cpp:29
 msgid "unnamed"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:100
+#: src/resources/db/itemdb.cpp:99
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min attack)
-#: src/resources/db/itemdb.cpp:102
+#: src/resources/db/itemdb.cpp:101
 #, c-format
 msgid "Min attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max attack)
-#: src/resources/db/itemdb.cpp:104
+#: src/resources/db/itemdb.cpp:103
 #, c-format
 msgid "Max attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack)
-#: src/resources/db/itemdb.cpp:106
+#: src/resources/db/itemdb.cpp:105
 #, c-format
 msgid "Critical attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic attack)
-#: src/resources/db/itemdb.cpp:108
+#: src/resources/db/itemdb.cpp:107
 #, c-format
 msgid "M. Attack %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (defence)
-#: src/resources/db/itemdb.cpp:110
+#: src/resources/db/itemdb.cpp:109
 #, c-format
 msgid "Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min defence)
-#: src/resources/db/itemdb.cpp:112
+#: src/resources/db/itemdb.cpp:111
 #, c-format
 msgid "Min defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max defence)
-#: src/resources/db/itemdb.cpp:114
+#: src/resources/db/itemdb.cpp:113
 #, c-format
 msgid "Max defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (critical defence)
-#: src/resources/db/itemdb.cpp:116
+#: src/resources/db/itemdb.cpp:115
 #, c-format
 msgid "Critical defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (magic defence)
-#: src/resources/db/itemdb.cpp:118
+#: src/resources/db/itemdb.cpp:117
 #, c-format
 msgid "M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min magic defence)
-#: src/resources/db/itemdb.cpp:120
+#: src/resources/db/itemdb.cpp:119
 #, c-format
 msgid "Min M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max magic defence)
-#: src/resources/db/itemdb.cpp:122
+#: src/resources/db/itemdb.cpp:121
 #, c-format
 msgid "Max M. Defense %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (health)
-#: src/resources/db/itemdb.cpp:124
+#: src/resources/db/itemdb.cpp:123
 #, c-format
 msgid "HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max health)
-#: src/resources/db/itemdb.cpp:126
+#: src/resources/db/itemdb.cpp:125
 #, c-format
 msgid "Max HP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (mana)
-#: src/resources/db/itemdb.cpp:128
+#: src/resources/db/itemdb.cpp:127
 #, c-format
 msgid "MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max mana)
-#: src/resources/db/itemdb.cpp:130
+#: src/resources/db/itemdb.cpp:129
 #, c-format
 msgid "Max MP %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (level)
-#: src/resources/db/itemdb.cpp:132
+#: src/resources/db/itemdb.cpp:131
 #, c-format
 msgid "Level %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (moving speed)
-#: src/resources/db/itemdb.cpp:134
+#: src/resources/db/itemdb.cpp:133
 #, c-format
 msgid "Speed %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (attack range)
-#: src/resources/db/itemdb.cpp:136
+#: src/resources/db/itemdb.cpp:135
 #, c-format
 msgid "Range %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (flee)
-#: src/resources/db/itemdb.cpp:138
+#: src/resources/db/itemdb.cpp:137
 #, c-format
 msgid "Flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (min flee)
-#: src/resources/db/itemdb.cpp:140
+#: src/resources/db/itemdb.cpp:139
 #, c-format
 msgid "Min flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (max flee)
-#: src/resources/db/itemdb.cpp:142
+#: src/resources/db/itemdb.cpp:141
 #, c-format
 msgid "Max flee %s"
 msgstr ""
 
 #. TRANSLATORS: item info label (card slots number)
-#: src/resources/db/itemdb.cpp:144
+#: src/resources/db/itemdb.cpp:143
 #, c-format
 msgid "Card slots %s"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/petdb.cpp:101
+#: src/resources/db/petdb.cpp:100
 msgid "pet"
 msgstr ""
 
 #. TRANSLATORS: unknown info name
-#: src/resources/db/skillunitdb.cpp:102
+#: src/resources/db/skillunitdb.cpp:101
 msgid "skill"
 msgstr ""