Update translations again.

23 files changed, 14054 insertions, 11051 deletions

diff --git a/po/ca.po b/po/ca.po
index 9edd00e57..a055ff451 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Arnau Mas <thealchemist886@gmail.com>, 2013-2016
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/ca/)\n"
+"Language-Team: Catalan (http://www.transifex.com/akaras/manaplus/language/"
+"ca/)\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -30,7 +31,6 @@ msgstr "Arxiu enviat"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -50,10 +50,9 @@ msgstr "Arxiu enviat"
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -102,80 +101,86 @@ msgid "Uploaded log into:"
 msgstr "Registre pujat a:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr "No has vist aquest nick."
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr "No s'ha pogut crear una taula de xiuxiueig  \"%s\"! Probablement ja existeix."
+msgstr ""
+"No s'ha pogut crear una taula de xiuxiueig  \"%s\"! Probablement ja existeix."
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Falta el nom del grup."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Crear grup"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Falta el nom del gremi."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Crear"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Si us plau especifica un nom."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "Tornar a alternar el xat."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "Missatge tanca el xat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "Torna ara a canviar el xat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "Missatge ara tanca el xat."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr "Barret equipat %s."
@@ -449,8 +454,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "Ignorar completament"
 
@@ -534,8 +539,8 @@ msgstr "Ajuda"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -1237,15 +1242,14 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
 #. TRANSLATORS: weight message
@@ -1262,8 +1266,7 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "Per defecte"
 
@@ -1424,8 +1427,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr ""
 
@@ -1731,8 +1734,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1751,58 +1754,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "Crear grup"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "Cancel·lar"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1824,7 +1775,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1838,8 +1789,8 @@ msgstr "Intercanvi"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "Atacar"
@@ -1850,36 +1801,36 @@ msgstr "Atacar"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr ""
 
@@ -1887,7 +1838,7 @@ msgstr ""
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr ""
 
@@ -1904,9 +1855,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "Moure"
@@ -1915,7 +1866,7 @@ msgstr "Moure"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Parlar"
@@ -1930,7 +1881,7 @@ msgstr "Parlar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1948,7 +1899,7 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1960,26 +1911,26 @@ msgstr "Vendre"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:320
+#: src/gui/popups/popupmenu.cpp:321
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr ""
 
@@ -1987,19 +1938,19 @@ msgstr ""
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr ""
 
@@ -2007,7 +1958,7 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr ""
 
@@ -2017,8 +1968,8 @@ msgstr ""
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr ""
@@ -2027,13 +1978,13 @@ msgstr ""
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr ""
 
@@ -2041,7 +1992,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2054,7 +2005,7 @@ msgstr "Des-equipar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr ""
 
@@ -2062,39 +2013,88 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "Cancel·lar"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Jugadors"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Afegir al xat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "Element del mapa"
 
@@ -2104,28 +2104,28 @@ msgstr "Element del mapa"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr ""
 
@@ -2134,7 +2134,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2142,69 +2142,68 @@ msgstr "Conjunt"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Conjurs"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "Netejar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "Desactivar ressaltat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr "Activa resaltat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "Borrar nom"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "Habilitar absència"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 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:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "Deixa"
 
@@ -2214,116 +2213,116 @@ msgstr "Deixa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "Canviar la posició del gremi"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 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:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "Nom:                     "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 msgid "Add to trade"
 msgstr "Afegeix al intercanvi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1745
+#: src/gui/popups/popupmenu.cpp:1762
 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:1750
+#: src/gui/popups/popupmenu.cpp:1767
 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:1754
+#: src/gui/popups/popupmenu.cpp:1771
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr "Agregar-los tots al intercanvi"
 
@@ -2332,8 +2331,8 @@ msgstr "Agregar-los tots al intercanvi"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2341,63 +2340,63 @@ msgstr "Emmagatzema"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "Emmagatzema 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "Emmagatzema la mitat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr "Emmagatzema-ho tot-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Emmagatzema-ho tot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "Recuperar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "Recupera 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 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:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Recupera-ho tot"
 
@@ -2408,17 +2407,17 @@ msgstr "Recupera-ho tot"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Utilitzar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr ""
 
@@ -2427,43 +2426,43 @@ msgstr ""
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "Amagar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr ""
 
@@ -2471,175 +2470,245 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "Per defecte"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Corregir posició automàticament"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 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:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Deixar caure..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr ""
 
@@ -2647,38 +2716,38 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Deixar caure"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr ""
 
@@ -2687,7 +2756,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2696,7 +2765,7 @@ msgstr "Inventari"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr "Emmagatzematge"
 
@@ -2705,7 +2774,7 @@ msgstr "Emmagatzematge"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2714,31 +2783,31 @@ msgstr "Motxilla"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr ""
 
@@ -2746,7 +2815,7 @@ msgstr ""
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr ""
 
@@ -2754,109 +2823,109 @@ msgstr ""
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2864,31 +2933,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2897,19 +2966,19 @@ msgstr ""
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2921,8 +2990,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2930,63 +2999,82 @@ msgstr "Informació"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "Deixar Grup?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr ""
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Corregir posició automàticament"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "Grup: %s"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3521,6 +3609,11 @@ msgstr ""
 msgid "Party"
 msgstr "Grup"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Falta el nom del grup."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3529,15 +3622,13 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3548,22 +3639,19 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4004,15 +4092,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Colors"
 
@@ -4036,9 +4124,11 @@ msgstr "Mostra llista de colors del xat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4065,9 +4155,11 @@ msgstr "Limitar màxim de caràcters en línia de xat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4078,7 +4170,9 @@ msgstr "Limitar màxim de lines de xat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4119,8 +4213,8 @@ msgstr "Mostra historial de xat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4131,9 +4225,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4144,9 +4240,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4162,9 +4260,13 @@ msgstr "Amaga missatges de botiga"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4177,7 +4279,8 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4196,9 +4299,12 @@ msgstr "Col·loca tots els xiuxiueigs en pestanyes"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4209,7 +4315,8 @@ msgstr "Registra els missatges de màgia en la pestanya del depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4222,9 +4329,11 @@ msgstr "Mostra els missatges del servidor en la finestra del depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4249,9 +4358,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4262,7 +4373,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4275,7 +4387,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4288,7 +4402,9 @@ msgstr "Permet pestanya de batalla"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4314,7 +4430,10 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4349,7 +4468,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4362,7 +4482,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4375,9 +4496,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4466,11 +4590,6 @@ msgid "Unassign"
 msgstr "Des-assignar"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "Per defecte"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr ""
@@ -4491,7 +4610,9 @@ msgstr "Conflicte de tecla(es) detectat."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Conflicte entre les tecles \"%s\" i \"%s\". Resol-lo, o la jugabilitat por resultar afectada."
+msgstr ""
+"Conflicte entre les tecles \"%s\" i \"%s\". Resol-lo, o la jugabilitat por "
+"resultar afectada."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5539,13 +5660,17 @@ msgstr "Res"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Error al canviar al mode finestra, la restauració al mode anterior també ha fallat!"
+msgstr ""
+"Error al canviar al mode finestra, la restauració al mode anterior també ha "
+"fallat!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Error al canviar al mode pantalla completa, la restauració al mode anterior també ha fallat!"
+msgstr ""
+"Error al canviar al mode pantalla completa, la restauració al mode anterior "
+"també ha fallat!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5586,7 +5711,8 @@ msgstr "La resolució de la pantalla ha canviat"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Algunes finestres poden ser mogudes per adaptar-se a la resolució més baixa."
+msgstr ""
+"Algunes finestres poden ser mogudes per adaptar-se a la resolució més baixa."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -5755,70 +5881,70 @@ msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Ha invitat a l'usuari %s al gremi %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "El gremi %s demana la sortida."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "Membre invitat al gremi"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Qui voldries invitar al gremi %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "Deixar gremi?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Estàs segur que vols deixar el gremi %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
@@ -5830,41 +5956,41 @@ msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Ha invitat al usuari %s al grup."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Renuncia al grup %s sol·licitada."
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "Invitació d'un membre al grup"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Qui voldries invitar al grup %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "Deixar Grup?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Estàs segur que vols deixar el grup %s?"
@@ -5876,17 +6002,17 @@ msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
@@ -6119,10 +6245,8 @@ msgstr ""
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Crear"
 
@@ -6239,8 +6363,7 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6258,8 +6381,7 @@ msgstr "Distribueix %d punts"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6285,8 +6407,7 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr ""
 
@@ -6451,11 +6572,6 @@ msgid "Yes"
 msgstr "si"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr ""
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr ""
@@ -6487,8 +6603,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Connectar"
 
@@ -6557,8 +6672,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr "Desconegut"
 
@@ -6854,15 +6969,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7264,173 +7377,138 @@ msgid "Up"
 msgstr "Aumentar"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Punts d'habilitat restants: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilitats %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "Habilitat %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivell: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "Invita"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Acceptada invitació a grup de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Refusada invitació al grup de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Acceptada invitació a gremi de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Refusada invitació al gremi de %s."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Creant gremi anomenat %s."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "Creant grup anomenat %s."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "Nom de gremi"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "Selecciona nom del gremi."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr "Invitació al grup rebuda, però ja n'hi ha una existent."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s t'ha invitat al gremi %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "Acceptar invitació a gremi"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "Rebuda invitació a grup, però ja n'hi ha una d'existent."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "Has estat invitat a unir-te a un grup."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Has estat invitat a unir-te al grup %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s t'ha invitat a unir-te al seu grup."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s t'ha invitat a unir-te al grup %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "Acceptar invitació a grup"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "No es pot crear grup. Ja en pertanys a un."
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "Nom del grup"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "Tria el nom del teu grup."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7570,9 +7648,10 @@ msgstr "No tens diners suficients."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "No s'ha pogut afegir objecte. No es pot afegir més d'un mateix tipus d'objecte a la finestra."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"No s'ha pogut afegir objecte. No es pot afegir més d'un mateix tipus "
+"d'objecte a la finestra."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -7657,25 +7736,25 @@ msgstr "Tria Món"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7683,7 +7762,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -10569,30 +10648,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr ""
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -10603,11 +10682,6 @@ msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr ""
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr ""
@@ -10626,7 +10700,8 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Les opcions per a /%s son \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Les opcions per a /%s son \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10682,3 +10757,30 @@ msgstr "Segon  %d"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segons"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Falta el nom del gremi."
+
+#~ msgid "Invite"
+#~ msgstr "Invita"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "Creant gremi anomenat %s."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "Creant grup anomenat %s."
+
+#~ msgid "Guild Name"
+#~ msgstr "Nom de gremi"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "Selecciona nom del gremi."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "No es pot crear grup. Ja en pertanys a un."
+
+#~ msgid "Party Name"
+#~ msgstr "Nom del grup"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "Tria el nom del teu grup."
diff --git a/po/cs.po b/po/cs.po
index 71db4817d..a64be45c3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Pitriss <chytrex@wjake.com>, 2011
@@ -14,14 +14,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/cs/)\n"
+"Language-Team: Czech (http://www.transifex.com/akaras/manaplus/language/"
+"cs/)\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. TRANSLATORS: file uploaded message
@@ -35,7 +36,6 @@ msgstr "Soubor byl uploadován"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -55,10 +55,9 @@ msgstr "Soubor byl uploadován"
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -107,80 +106,85 @@ msgid "Uploaded log into:"
 msgstr "Nahrány záznmy do:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
 msgstr "Není možné vytvořit záložku šeptání \"%s\"! Zdá se že již existuje."
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Chybí jméno party."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Vytvořit partu"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Chybí jméno gildy."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Gilda cíle:"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Prosím zadej jméno."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "Enter přepíná chat."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "Zpráva zavírá chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "Enter nyní přepíná chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "Zpráva nyní ukončuje chat."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -455,8 +459,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "Kompletně ignorovat"
 
@@ -540,8 +544,8 @@ msgstr "Nápověda"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -753,7 +757,8 @@ msgstr "     --renderer       : Nastaví typ vykreslování"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --tests          : Spustit testování ovladačů a automatickou konfiguraci"
+msgstr ""
+"  -T --tests          : Spustit testování ovladačů a automatickou konfiguraci"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -1243,21 +1248,21 @@ msgstr "Zpráva"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr "Oživ"
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "Nesete více než polovinu vaší váhy. Regenerace života nyní není možná."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Nesete méně než polovinu vaší váhy. Regenerace života je nyní opět možná."
+msgstr ""
+"Nesete méně než polovinu vaší váhy. Regenerace života je nyní opět možná."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1268,8 +1273,7 @@ msgstr "Nesete méně než polovinu vaší váhy. Regenerace života je nyní op
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "výchozí"
 
@@ -1430,8 +1434,8 @@ msgstr "Maximální (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(výchozí)"
 
@@ -1737,8 +1741,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1757,58 +1761,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "Vytvořit partu"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "Zrušit"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1830,7 +1782,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1844,8 +1796,8 @@ msgstr "Obchod"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "Útok"
@@ -1856,36 +1808,36 @@ msgstr "Útok"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "Šeptat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "Vyléčit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "Vykopnout z gildy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 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:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "Pozvat do gildy"
 
@@ -1893,7 +1845,7 @@ msgstr "Pozvat do gildy"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "Vyhladit"
 
@@ -1910,9 +1862,9 @@ msgstr "Vyhladit"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "Jdi sem"
@@ -1921,7 +1873,7 @@ msgstr "Jdi sem"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Promluv"
@@ -1936,7 +1888,7 @@ msgstr "Promluv"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1954,7 +1906,7 @@ msgstr "Nákup"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1966,26 +1918,26 @@ msgstr "Prodej"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr "Přidat komentář"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 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:320
+#: src/gui/popups/popupmenu.cpp:321
 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:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "Přidat do seznamu útoku"
 
@@ -1993,19 +1945,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:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 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:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr "Přesunout k veliteli"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr "Oheň"
 
@@ -2013,7 +1965,7 @@ msgstr "Oheň"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr "Nakrmit"
 
@@ -2023,8 +1975,8 @@ msgstr "Nakrmit"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "Přejmenovat"
@@ -2033,13 +1985,13 @@ msgstr "Přejmenovat"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr "Zabít"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr "Upustit kořist"
 
@@ -2047,7 +1999,7 @@ msgstr "Upustit kořist"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2060,7 +2012,7 @@ msgstr "Odebrat z vybavení"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr "Vrátit k vejci"
 
@@ -2068,39 +2020,88 @@ 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:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "Vložit jméno do chatu"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "Zrušit"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Hráči"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Vykopnout z party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "Sebrat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Přidat do chatu"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "Označit na mapě"
 
@@ -2110,28 +2111,28 @@ msgstr "Označit na mapě"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "Odebrat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr "Přesun"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr "Přesunout kameru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr ""
 
@@ -2140,7 +2141,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2148,69 +2149,68 @@ msgstr "Výstroje"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr "Vyčistit výstroj"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Kouzla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 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:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "Vymazat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "Vypnout zvýrazňování"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 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:852
+#: src/gui/popups/popupmenu.cpp:869
 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:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "Odebrat jméno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "Zapnout \"away\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 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:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "Opustit"
 
@@ -2220,116 +2220,116 @@ msgstr "Opustit"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr "Kopírovat do schránky"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "Změň hodnost v guildě"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr "okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr "Odemknout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr "Zamknout"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr "Hráč"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr "Človíček"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr "Žoldák"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 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:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "Jméno:                   "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr "Hráčův komentář           "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr "Komentář:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 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:1745
+#: src/gui/popups/popupmenu.cpp:1762
 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:1750
+#: src/gui/popups/popupmenu.cpp:1767
 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:1754
+#: src/gui/popups/popupmenu.cpp:1771
 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:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr "Přidat vše k obchodu"
 
@@ -2338,8 +2338,8 @@ msgstr "Přidat vše k obchodu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2347,63 +2347,63 @@ msgstr "Uložit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "Uschovat 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "Uschovat polovinu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 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:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Uschovat všechny"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "Vzít"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "Vzít 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 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:1826
+#: src/gui/popups/popupmenu.cpp:1843
 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:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Vzít všechny"
 
@@ -2414,17 +2414,17 @@ msgstr "Vzít všechny"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Použít"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr "Vyčistit okno upuštění"
 
@@ -2433,43 +2433,43 @@ msgstr "Vyčistit okno upuštění"
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "Skrýt"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "Zobrazit"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 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:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr "Zkopírovat do chatu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "Posunout nahoru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr "Posunout dolů"
 
@@ -2477,175 +2477,245 @@ msgstr "Posunout dolů"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr "Svléknout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr "Kopírovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr "Vložit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr "Otevřít odkaz"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr "Zobrazit okno"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "Výchozí"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr "Cíl"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Automaticky upravit pozici"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr "Svůj"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 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:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 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:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr "Černá listina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr "Nastavit jako nepřítele"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr "Vymazat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "Být přátelé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "Odignorovat"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "Následovat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "Koupit (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "Prodat (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "Pozvat do party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr "Připojit k chatu %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "Zobrazit předměty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr "Odeber ze seznamu sběru"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 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:2769
+#: src/gui/popups/popupmenu.cpp:2885
 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:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr "Chránit předmět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Upustit..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "Upustit vše"
 
@@ -2653,38 +2723,38 @@ msgstr "Upustit vše"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Upustit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr ""
 
@@ -2693,7 +2763,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2702,7 +2772,7 @@ msgstr "Inventář"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr "Sklad"
 
@@ -2711,7 +2781,7 @@ msgstr "Sklad"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2720,31 +2790,31 @@ msgstr "Košík"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Příkazy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr "Zkontrolovat ip"
 
@@ -2752,7 +2822,7 @@ msgstr "Zkontrolovat ip"
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr "Jdi na"
 
@@ -2760,109 +2830,109 @@ msgstr "Jdi na"
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr "Zavolej zpět"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2870,31 +2940,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr "Vykopnout"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2903,19 +2973,19 @@ msgstr ""
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2927,8 +2997,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2936,63 +3006,82 @@ msgstr "Informace"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr "GM příkazy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "Opustit partu?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr ""
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Automaticky upravit pozici"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "Typ: %s"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3527,6 +3616,11 @@ msgstr "Jazyk"
 msgid "Party"
 msgstr "Parta"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Chybí jméno party."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3535,15 +3629,13 @@ msgstr "Sdílení předmětů povoleno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Sdílení předmětů zakázáno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Sdílení předmětů není možné."
 
@@ -3554,22 +3646,19 @@ msgstr "Stav sdílení předmětů neznámý."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Sdílení zkušeností povoleno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Sdílení zkušeností zakázáno."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Sdílení zkušeností není možné."
 
@@ -4010,15 +4099,15 @@ msgstr "Chránít zaměření chatu"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Barvy"
 
@@ -4042,9 +4131,11 @@ msgstr "Zobrazit seznam barev"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4071,9 +4162,11 @@ msgstr "Omezit maximum znaků na řádek"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4084,7 +4177,9 @@ msgstr "Omezit počet řádků chatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4125,8 +4220,8 @@ msgstr "Zobrazovat historii chatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4137,9 +4232,11 @@ msgstr "Zobrazit zprávy o připojení party"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4150,9 +4247,11 @@ msgstr "Zobrazit zprávy o připojení gildy"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4168,9 +4267,13 @@ msgstr "Skrýt obchodní zprávy"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4183,7 +4286,8 @@ msgstr "Zobrazit MVP zprávy"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4202,9 +4306,12 @@ msgstr "Všecha šeptání jako záložky"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4215,7 +4322,8 @@ msgstr "Zaznamenávat zprávy o magii v debug záložce"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4228,9 +4336,11 @@ msgstr "Zobrazovat serverové zprávy v debug záložce"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4255,9 +4365,11 @@ msgstr "Povolit GM záložku"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4268,7 +4380,8 @@ msgstr "Povolit záložku jazyka"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4281,7 +4394,9 @@ msgstr "Zobrazit zprávy všech jazyků"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4294,7 +4409,9 @@ msgstr "Zapnout bitevní záložku"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4320,7 +4437,10 @@ msgstr "Změnit velikost záložek pokud nutno"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4355,7 +4475,8 @@ msgstr "Zvýrazňovaná slova (oddělená čárkou)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4368,7 +4489,8 @@ msgstr "Globálně ignorovaná jména (oddělená čárkou)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4381,9 +4503,12 @@ msgstr "Zobrazit knoflík pro smajlíky v chatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4472,11 +4597,6 @@ msgid "Unassign"
 msgstr "Odebrat"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "Výchozí"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Resetovat všecky klávesy"
@@ -4497,7 +4617,9 @@ msgstr "Kolize kláves detekována/y."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřeš jej, neboť se hra může chovat podivně."
+msgstr ""
+"Konflikt klávesy \"%s\" a klávesy \"%s\". Vyřeš jej, neboť se hra může "
+"chovat podivně."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5045,7 +5167,9 @@ msgstr "HW akcelerace"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 msgid "Enable opacity cache (Software, can use much memory)"
-msgstr "Povolit vyrovnávací pamět průhlednosti (Softwarově, může používat hodně paměti)"
+msgstr ""
+"Povolit vyrovnávací pamět průhlednosti (Softwarově, může používat hodně "
+"paměti)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:79
@@ -5130,12 +5254,15 @@ msgstr "Zapni atlasy textur (OpenGL)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Cache all sprites per map (can use additional memory)"
-msgstr "Načítat veškeré obrázky pro mapu do vyrovnávací paměti (může používat více paměti)"
+msgstr ""
+"Načítat veškeré obrázky pro mapu do vyrovnávací paměti (může používat více "
+"paměti)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:155
 msgid "Cache all sounds (can use additional memory)"
-msgstr "Uchovávat všechny zvuky ve vyrovnávací paměti (může používat více paměti)"
+msgstr ""
+"Uchovávat všechny zvuky ve vyrovnávací paměti (může používat více paměti)"
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:160
@@ -5266,7 +5393,9 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_players.cpp:143
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
-msgstr "Emulovat prave kliknutí tlačítka myši dlouhým klinutím myši (užitečné pro dotyková rozhraní)"
+msgstr ""
+"Emulovat prave kliknutí tlačítka myši dlouhým klinutím myši (užitečné pro "
+"dotyková rozhraní)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:148
@@ -5545,13 +5674,16 @@ msgstr "Žádné"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Selhalo přepnutí do módu v okně a obnovení předchozího módu taktéž selhalo!"
+msgstr ""
+"Selhalo přepnutí do módu v okně a obnovení předchozího módu taktéž selhalo!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Selhalo přepnutí do módu celé obrazovky a obnovení předchozího módu taktéž selhalo!"
+msgstr ""
+"Selhalo přepnutí do módu celé obrazovky a obnovení předchozího módu taktéž "
+"selhalo!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5761,70 +5893,70 @@ msgid "Atk"
 msgstr "FÚ"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr "Prioritní monstra"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr "Útočit na monstra"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr "Ignorovat monstra"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr "Přátelé: %u/%u"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr "Hráči: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Pozvali jste %s do gildy %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Požadován odchod z gildy %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "Člen pozval do gildy"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Koho byste rád pozval do gildy %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "Opustit gildu?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Jste si jisti že chcete opustit gildu %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr "Členové: %u/%u"
@@ -5836,41 +5968,41 @@ msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr "Portály: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Hráč %s pozván do party."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Odchod z party %s vyžádán."
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "Přijetí člena do party"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Koho chceš pozvat do party %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "Opustit partu?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Opravdu chceš opustit partu %s?"
@@ -5882,17 +6014,17 @@ msgid "Pik"
 msgstr "Sb"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr "Sbírej věci"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr "Ignoruj věci"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr "Viditelní hráči: %d"
@@ -6125,10 +6257,8 @@ msgstr "Počet:"
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Vytvořit"
 
@@ -6245,8 +6375,7 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6264,8 +6393,7 @@ msgstr "Rozdělte prosím %d bodů"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6291,8 +6419,7 @@ msgstr "Vzhled:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr "P"
 
@@ -6391,7 +6518,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "Život: %u/%u\nMana: %u/%u\nÚroveň: %u\nZkušenost: %u\nPeníze: %s"
+msgstr ""
+"Život: %u/%u\n"
+"Mana: %u/%u\n"
+"Úroveň: %u\n"
+"Zkušenost: %u\n"
+"Peníze: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6457,11 +6589,6 @@ msgid "Yes"
 msgstr "Ano"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr "Cíl"
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr "Síť"
@@ -6493,8 +6620,7 @@ msgstr "Upravit server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Připojit"
 
@@ -6563,8 +6689,8 @@ msgstr "Písma"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr "Neznámý"
 
@@ -6862,15 +6988,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7272,173 +7396,138 @@ msgid "Up"
 msgstr "Zvýšit"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Dovednostních bodů: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr "Dovednost nastavena %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "Dovednost %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Úroveň: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Neúspěšná dovednost: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr "H"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "Pozvat"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Přijato pozvání do party od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odmítnuto přijetí do party od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Přijato pozvání do gildy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odmítnuto pozvání do gildy od %s."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Vytvářím gildu s názvem %s."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "Vytvářím partu s názvem %s."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "Název gildy"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "Zvolte jméno vaší gildy."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr "Obdržen požadavek na vytvoření gildy, ale tato již existuje."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s vás zve ke vstupu do gildy %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "Přílmout pozvání do gildy"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "Obdržen požadavek na vytvoření party, ale tato již existuje."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "Byli jste pozváni k připojení se do party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Byli jste pozváni k připojení se do party %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s vás pozval ke vstupu do jeho party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s vás zve ke vstupu do party: %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "Přijmout pozvání do party"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "Nemohu vytvořit partu. Již jste členem party."
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "Jméno party"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "Zvolte jméno vaší party."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7578,8 +7667,7 @@ msgstr "Nemáš dost peněz."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Přidání věci selhalo. Nelze předávat stejný předmět v jednom okně."
 
 #. TRANSLATORS: trade error
@@ -7665,25 +7753,25 @@ msgstr "Vyber svět"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "kl_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr "Jknoflík%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr "neznámá klávesa"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr "JK%d"
@@ -7691,7 +7779,7 @@ msgstr "JK%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "n kl"
 
@@ -8520,7 +8608,9 @@ msgstr "Vypsat verzi OpenGL do chatu"
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:370
 msgid "Print enabled mods in chat"
-msgstr "Vypsa\nt povolené mody do chatu"
+msgstr ""
+"Vypsa\n"
+"t povolené mody do chatu"
 
 #. TRANSLATORS: input action name
 #: src/input/pages/other.cpp:376
@@ -8849,7 +8939,9 @@ msgstr "Neznámá chyba postavy na serveru."
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Nelze vytvořit postavu. Nejpravděpodobněji její jméno již na serveru existuje."
+msgstr ""
+"Nelze vytvořit postavu. Nejpravděpodobněji její jméno již na serveru "
+"existuje."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:160
@@ -9007,7 +9099,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Byl jste dočasně vyloučen ze hry do %s.\nProsím kontaktujte GM team přes fórum."
+msgstr ""
+"Byl jste dočasně vyloučen ze hry do %s.\n"
+"Prosím kontaktujte GM team přes fórum."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10577,30 +10671,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr "Neznámý:"
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr " / Mana: -%d"
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr "Dosah: %d"
@@ -10611,11 +10705,6 @@ msgid "Ground"
 msgstr "Země"
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr "Svůj"
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr "Nepoužitý"
@@ -10690,3 +10779,30 @@ msgstr "%d vteřinu"
 #, c-format
 msgid "%d seconds"
 msgstr "%d vteřin"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Chybí jméno gildy."
+
+#~ msgid "Invite"
+#~ msgstr "Pozvat"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "Vytvářím gildu s názvem %s."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "Vytvářím partu s názvem %s."
+
+#~ msgid "Guild Name"
+#~ msgstr "Název gildy"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "Zvolte jméno vaší gildy."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "Nemohu vytvořit partu. Již jste členem party."
+
+#~ msgid "Party Name"
+#~ msgstr "Jméno party"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "Zvolte jméno vaší party."
diff --git a/po/de.po b/po/de.po
index 5a49326a0..dc04418e6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # 3_0_3 <jack@krass.com>, 2011
 # Andrei Karas <akaras@inbox.ru>, 2011
@@ -38,14 +38,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: German (http://www.transifex.com/akaras/manaplus/language/de/)\n"
+"Language-Team: German (http://www.transifex.com/akaras/manaplus/language/"
+"de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -59,7 +60,6 @@ msgstr "Datei hochgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -79,10 +79,9 @@ msgstr "Datei hochgeladen"
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -131,80 +130,89 @@ msgid "Uploaded log into:"
 msgstr "Log hoch geladen zu:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
-msgstr "Zuletzt deaktiviert gesehen. Aktiviere in Spieler / Rufe Player ID ab und prüfe Log."
+msgstr ""
+"Zuletzt deaktiviert gesehen. Aktiviere in Spieler / Rufe Player ID ab und "
+"prüfe Log."
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr "Du hast diesen Spieler nicht gesehen."
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr "Zuletzt gesehen für %s: %s"
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr "Kann keine leeren Flüster- oder Channelnachrichten versenden!"
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr "Kann keinen Flüsterreiter \"%s\" erstellen!  Möglicherweise existiert der Reiter bereits."
+msgstr ""
+"Kann keinen Flüsterreiter \"%s\" erstellen!  Möglicherweise existiert der "
+"Reiter bereits."
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Name der Gruppe fehlt."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Gruppe erstellen"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Name der Gilde fehlt."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Gilde zerschlagen"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Bitte gib einen Namen an."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "Enter schaltet Chat um."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "Nachricht schließt den Chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "Enter schaltet nun den Chat um."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "Nachricht schließt nun den Chat."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr "Kein Hut ausgerüstet."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr "Hut %s angezogen."
@@ -478,8 +486,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "Komplett ignorieren"
 
@@ -563,8 +571,8 @@ msgstr "Hilfe"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -741,7 +749,8 @@ msgstr "  -H --update-host    : Update host benutzen"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Voreingestellten Charakterserver und Charakter wählen"
+msgstr ""
+"  -D --default        : Voreingestellten Charakterserver und Charakter wählen"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:93
@@ -751,12 +760,15 @@ msgstr "  -u --skip-update    :  Herunterladen von Updates überspringen"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Verzeichnis von dem Spieldaten geladen werden sollen"
+msgstr ""
+"  -d --data           : Verzeichnis von dem Spieldaten geladen werden sollen"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Verzeichnis das als Lokales Verzeichnis benutzt werden soll"
+msgstr ""
+"  -L --localdata-dir  : Verzeichnis das als Lokales Verzeichnis benutzt "
+"werden soll"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:103
@@ -776,7 +788,8 @@ msgstr "     --renderer       : Renderer-Typ setzen"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --Tests          : Treibertest und automatische Konfiguration starten"
+msgstr ""
+"  -T --Tests          : Treibertest und automatische Konfiguration starten"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -1266,21 +1279,24 @@ msgstr "Nachricht"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr "Wiederbeleben"
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Du trägst mehr als die Hälfte die du tragen kannst. Du kannst nun deine Gesundheit nicht mehr regenerieren."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Du trägst mehr als die Hälfte die du tragen kannst. Du kannst nun deine "
+"Gesundheit nicht mehr regenerieren."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Du trägst weniger als die Hälfte des Gewichts. Du kannst nun deine Gesundheit regenerieren."
+msgstr ""
+"Du trägst weniger als die Hälfte des Gewichts. Du kannst nun deine "
+"Gesundheit regenerieren."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1291,8 +1307,7 @@ msgstr "Du trägst weniger als die Hälfte des Gewichts. Du kannst nun deine Ges
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "Standard"
 
@@ -1453,8 +1468,8 @@ msgstr "Riesig (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(Normal)"
 
@@ -1760,8 +1775,8 @@ msgstr "Chatroom: %s"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1780,58 +1795,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr "Partikel: %u"
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "Gruppe erstellen"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "Abbrechen"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1853,7 +1816,7 @@ msgstr "Karten: "
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1867,8 +1830,8 @@ msgstr "Handeln"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "Angriff"
@@ -1879,36 +1842,36 @@ msgstr "Angriff"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "Flüstern"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "Heilen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "Aus Gilde werfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 msgid "Change pos in guild"
 msgstr "Rang in Gilde ändern"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "In Gilde einladen"
 
@@ -1916,7 +1879,7 @@ msgstr "In Gilde einladen"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "Atombombe"
 
@@ -1933,9 +1896,9 @@ msgstr "Atombombe"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "Bewegen"
@@ -1944,7 +1907,7 @@ msgstr "Bewegen"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Sprechen"
@@ -1959,7 +1922,7 @@ msgstr "Sprechen"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1977,7 +1940,7 @@ msgstr "Kaufen"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1989,26 +1952,26 @@ msgstr "Verkaufen"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr "Kommentar hinzufügen"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 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:320
+#: src/gui/popups/popupmenu.cpp:321
 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:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "Zur Angriffsliste hinzufügen"
 
@@ -2016,19 +1979,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:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 msgid "Add to ignore list"
 msgstr "Zur Ignorierenliste hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr "Zum Meister bewegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr "Feuern"
 
@@ -2036,7 +1999,7 @@ msgstr "Feuern"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr "Füttern"
 
@@ -2046,8 +2009,8 @@ msgstr "Füttern"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "Umbenennen"
@@ -2056,13 +2019,13 @@ msgstr "Umbenennen"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr "Töten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr "Beute wegwerfen"
 
@@ -2070,7 +2033,7 @@ msgstr "Beute wegwerfen"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2083,7 +2046,7 @@ msgstr "Ablegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr "Zum Ei zurückkehren"
 
@@ -2091,39 +2054,88 @@ 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:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "Name zum Chat hinzufügen"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "Abbrechen"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Spieler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Aus Gruppe werfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "Aufheben"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Zum Chat hinzufügen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "Kartengegenstand"
 
@@ -2133,28 +2145,28 @@ msgstr "Kartengegenstand"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "Entfernen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr "Teleport"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr "Kamera bewegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr "Kamera wiederherstellen"
 
@@ -2163,7 +2175,7 @@ msgstr "Kamera wiederherstellen"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2171,69 +2183,68 @@ msgstr "Ausrüstungset"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr "Ausrüstungset leeren"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Zaubersprüche"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 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:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "Leeren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "Hervorhebung abschalten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr "Hervorhebung einschalten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 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:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "Namen löschen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "Abwesendheitsmodus aktvieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 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:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "Verlassen"
 
@@ -2243,116 +2254,116 @@ msgstr "Verlassen"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr "In die Zwischenablage kopieren"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "Position der Gilde ändern"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr "Fenster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr "Entsperren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr "Sperren"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr "Zeige Emotes für:"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr "Spieler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr "Haustier"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr "Humunkulus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr "Söldner"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 msgid "Rename map sign          "
 msgstr "Kartenzeichen umbenennen "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "Name:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr "Spieler Kommentar         "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr "Kommentar:                 "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 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:1745
+#: src/gui/popups/popupmenu.cpp:1762
 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:1750
+#: src/gui/popups/popupmenu.cpp:1767
 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:1754
+#: src/gui/popups/popupmenu.cpp:1771
 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:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr "Alles zum Handeln hinzufügen"
 
@@ -2361,8 +2372,8 @@ msgstr "Alles zum Handeln hinzufügen"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2370,63 +2381,63 @@ msgstr "Aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "10 aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "Hälfte aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr "Alles -1 ablegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Alles aufbewahren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr "Zum Herstellen bewegen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "Abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "10 abholen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 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:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr "Alles -1 aufnehmen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Alles abholen"
 
@@ -2437,17 +2448,17 @@ msgstr "Alles abholen"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Benutzen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr "Fenster: Wegwerfen leeren"
 
@@ -2456,43 +2467,43 @@ msgstr "Fenster: Wegwerfen leeren"
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "Verstecke"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "Zeige"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr "Einstellungen des gelben Balkens öffnen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 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:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr "Zu Chat kopieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "Nach oben bewegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr "Nach unten bewegen"
 
@@ -2500,175 +2511,247 @@ msgstr "Nach unten bewegen"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr "Ausziehen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr "Kopieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr "Einfügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr "Link öffnen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr "Fenster anzeigen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr "Fähigkeit"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+#, fuzzy
+msgid "Skill level..."
+msgstr "Setze Fähigkeitslevel"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+#, fuzzy
+msgid "Select skill level"
 msgstr "Setze Fähigkeitslevel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr "Max Level"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "Standard"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr "Ziel"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Automatische Korrektur der Position"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr "Selbst"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 msgid "Disregard"
 msgstr "Missachten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 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:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr "Schwarze Liste"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr "Als Feind setzen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr "Löschen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "Befreunden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "Nicht mehr Ignorieren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "Folgen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr "Imitieren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "Kaufen (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "Verkaufen (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "Zu Gruppe einladen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr "Chat beitreten %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "Gegenstände anzeigen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr "Von der Aufhebeliste entfernen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Add to pickup list"
 msgstr "Zur Aufhebeliste hinzufügen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr "Gegenstand nicht mehr schützen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr "Gegenstand schützen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Wegwerfen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "Alles wegwerfen"
 
@@ -2676,38 +2759,38 @@ msgstr "Alles wegwerfen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Wegwerfen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr "GM...."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr "Zeige %s"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr "Account Info"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr "Stufe"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr "Status"
 
@@ -2716,7 +2799,7 @@ msgstr "Status"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2725,7 +2808,7 @@ msgstr "Inventar"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr "Lager"
 
@@ -2734,7 +2817,7 @@ msgstr "Lager"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2743,31 +2826,31 @@ msgstr "Einkaufswagen"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Befehle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr "Charakterbefehle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr "Zurück"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr "Finden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr "IP überprüfen"
 
@@ -2775,7 +2858,7 @@ msgstr "IP überprüfen"
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr "Gehe zu"
 
@@ -2783,109 +2866,109 @@ msgstr "Gehe zu"
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr "Zurückrufen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr "Rufe Party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr "Rufe Gilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr "Gruppenanführer anzeigen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr "Zeige..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr "Stummschalten..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr "Unsterblich"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr "Einsperren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr "Befreien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr "Killer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr "Kann getötet werden"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr "Setze Speicherpunkt"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr "Teleport zu Speicherpunkt"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr "zufälliger Teleport"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr "Klon erzeugen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr "Versklavten Klon erzeugen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr "Bösen Klon erzeugen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr "Gilde zerschlagen"
 
@@ -2893,31 +2976,31 @@ msgstr "Gilde zerschlagen"
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr "Rauswerfen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr "%s stummschalten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr "Stummschalten %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr "Laut schalten %d"
@@ -2926,19 +3009,19 @@ msgstr "Laut schalten %d"
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr "Tarnen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr "Dasselbe erzeugen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr "Sklave erzeugen"
 
@@ -2950,8 +3033,8 @@ msgstr "Sklave erzeugen"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2959,63 +3042,82 @@ msgstr "Info"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr "Suchen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr "erzeugte Monster suchen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr "Wer verliert Beute"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr "GM Befehle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr "Bewege %d zum Herzustellen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr "Mail an..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr "Hauszier zähmen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr "Kind adoptieren"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "Gruppe verlassen?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr "Level: %d / %d"
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr "Level: Unbekannt"
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Automatische Korrektur der Position"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "Typ: %s"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3550,6 +3652,11 @@ msgstr "Sprache"
 msgid "Party"
 msgstr "Gruppe"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Name der Gruppe fehlt."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3558,15 +3665,13 @@ msgstr "Teilen von Gegenständen aktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Teilen von Gegenständen deaktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Teilen von Gegenständen nicht möglich."
 
@@ -3577,22 +3682,19 @@ msgstr "Teilen von Gegenständen unbekannt."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Teilen von Erfahrung aktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Teilen von Erfahrung deaktiviert."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Teilen von Erfahrung nicht möglich."
 
@@ -4021,7 +4123,11 @@ msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
 "Hit Enter or hover mouse to show chat again."
-msgstr "Chatfenster wird automatisch versteckt, wenn es nicht benutzt wird.\n\nDrücke Enter oder fahre mit der Maus darüber, um es wieder sichtbar zu machen."
+msgstr ""
+"Chatfenster wird automatisch versteckt, wenn es nicht benutzt wird.\n"
+"\n"
+"Drücke Enter oder fahre mit der Maus darüber, um es wieder sichtbar zu "
+"machen."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4033,15 +4139,19 @@ msgstr "Chatfokus schützen"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
-msgstr "Aktiviert den aggressiven Schutz des Eingabefokuses im Chatfenster.\n\nHinweis: Keine anderen Texteingaben können empfangen werden, wenn du im Chateingabefeld schreibst."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
+msgstr ""
+"Aktiviert den aggressiven Schutz des Eingabefokuses im Chatfenster.\n"
+"\n"
+"Hinweis: Keine anderen Texteingaben können empfangen werden, wenn du im "
+"Chateingabefeld schreibst."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Farben"
 
@@ -4055,7 +4165,10 @@ msgstr "Farben von eingehenden Chatnachrichten entfernen"
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
-msgstr "Diese Einstellung aktivieren um Farben von eingehenden Chat zu entfernen. Alle Nachrichten werden die voreingestellte Chattextfarbe benutzen, falls dies aktiviert ist."
+msgstr ""
+"Diese Einstellung aktivieren um Farben von eingehenden Chat zu entfernen. "
+"Alle Nachrichten werden die voreingestellte Chattextfarbe benutzen, falls "
+"dies aktiviert ist."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:77
@@ -4065,10 +4178,18 @@ msgstr "Chatfarben-Liste anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
-msgstr "Diese Einstellung aktivieren um die Farbauswahl Dropdown-Liste im Chatfenster anzuzeigen. Das Chatfenster wird die Farbauswahl Dropdown-Liste anzeigen.\n\nDies erlaubt die einfache Einstellung für die Farbe von ausgehenden Nachrichten, aber belegt auch etwas Platz im Chatfenster."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
+msgstr ""
+"Diese Einstellung aktivieren um die Farbauswahl Dropdown-Liste im "
+"Chatfenster anzuzeigen. Das Chatfenster wird die Farbauswahl Dropdown-Liste "
+"anzeigen.\n"
+"\n"
+"Dies erlaubt die einfache Einstellung für die Farbe von ausgehenden "
+"Nachrichten, aber belegt auch etwas Platz im Chatfenster."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:90
@@ -4079,7 +4200,9 @@ msgstr "Magie- und GM-Befehle in jedem Chatreiter erlauben"
 #: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
-msgstr "Diese Einstellung aktivieren, um Zaubersprüche und GM-Befehle in jedem Reiter ausführen zu können."
+msgstr ""
+"Diese Einstellung aktivieren, um Zaubersprüche und GM-Befehle in jedem "
+"Reiter ausführen zu können."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:98
@@ -4094,10 +4217,17 @@ msgstr "Maximale Zeichen in Chatzeile begrenzen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
+"\n"
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
+msgstr ""
+"Begrenzt die Anzahl an Buchstaben welche als längste Zeile als Text im Chat "
+"angezeigt werden können.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
-msgstr "Begrenzt die Anzahl an Buchstaben welche als längste Zeile als Text im Chat angezeigt werden können.\n\nHinweis: Lange Zeilen können den Klienten langsamer machen. Zeilen die länger als die Begrenzung sind werden abgeschnitten."
+"Hinweis: Lange Zeilen können den Klienten langsamer machen. Zeilen die "
+"länger als die Begrenzung sind werden abgeschnitten."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:110
@@ -4107,10 +4237,15 @@ msgstr "Maximale Zeilen im Chat begrenzen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
-msgstr "Begrenzt, wieviele Chatzeilen im Rückholspeicher bleiben. Der Chat speichert angegebene Anzahl von letzten Textzeilen. Die ältesten Zeilen, welche die Begrenzung überschreiten, werden aus dem Rückholspeicher verworfen."
+msgstr ""
+"Begrenzt, wieviele Chatzeilen im Rückholspeicher bleiben. Der Chat speichert "
+"angegebene Anzahl von letzten Textzeilen. Die ältesten Zeilen, welche die "
+"Begrenzung überschreiten, werden aus dem Rückholspeicher verworfen."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:120
@@ -4128,7 +4263,12 @@ msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
 "Note: chat logs can take noticeable amount of disk space over time."
-msgstr "Falls du diese Einstellung aktivierst, werden Chatlogs auf die Festplatte geschrieben.\n\nHinweis: Chatlogs können über die Zeit eine deutliche Menge an Festplattenspeicher einnehmen."
+msgstr ""
+"Falls du diese Einstellung aktivierst, werden Chatlogs auf die Festplatte "
+"geschrieben.\n"
+"\n"
+"Hinweis: Chatlogs können über die Zeit eine deutliche Menge an "
+"Festplattenspeicher einnehmen."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:131
@@ -4138,7 +4278,9 @@ msgstr "Debug-Chatlog aktivieren"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
-msgstr "Wenn du dies aktivierst, wird der Debug Chatreiter ebenfalls auf der Festplatte geloggt."
+msgstr ""
+"Wenn du dies aktivierst, wird der Debug Chatreiter ebenfalls auf der "
+"Festplatte geloggt."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:137
@@ -4148,9 +4290,11 @@ msgstr "Chatverlauf anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
-msgstr "Falls diese Einstellung aktivert ist, wird der Klient alte Logs beim Start laden anstatt das leere Chatreiter angezeigt werden."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
+msgstr ""
+"Falls diese Einstellung aktivert ist, wird der Klient alte Logs beim Start "
+"laden anstatt das leere Chatreiter angezeigt werden."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:144
@@ -4160,10 +4304,17 @@ msgstr "Gruppennachrichten über Anwesenheit anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
+"\n"
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
+msgstr ""
+"Falls diese Einstellung aktivert ist, werden Statusänderungen der "
+"Gruppenmitglieder im Gruppenreiter des Chats angezeigt. \n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
-msgstr "Falls diese Einstellung aktivert ist, werden Statusänderungen der Gruppenmitglieder im Gruppenreiter des Chats angezeigt. \n\nDies fügt etwas Tumult zum Chat hinzu, aber erlaubt es auch zu sehen, wenn deine Freunde online kommen."
+"Dies fügt etwas Tumult zum Chat hinzu, aber erlaubt es auch zu sehen, wenn "
+"deine Freunde online kommen."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:152
@@ -4173,10 +4324,17 @@ msgstr "Gildennachrichten über Anwesenheit anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
-msgstr "Falls diese Einstellung aktivert ist, werden Statusänderungen der Gildenmitglieder im Gildenreiter des Chats angezeigt. \n\nDies fügt etwas Tumult zum Chat hinzu, aber erlaubt es auch zu sehen, wenn deine Freunde online kommen."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
+msgstr ""
+"Falls diese Einstellung aktivert ist, werden Statusänderungen der "
+"Gildenmitglieder im Gildenreiter des Chats angezeigt. \n"
+"\n"
+"Dies fügt etwas Tumult zum Chat hinzu, aber erlaubt es auch zu sehen, wenn "
+"deine Freunde online kommen."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:161
@@ -4191,10 +4349,22 @@ msgstr "Mitteilungen über Laden verstecken"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
-msgstr "Falls diese Einstellung aktiviert ist werden keine Nachrichten in Bezug auf den eingebauten ManaPlus-Shop im Chat angezeigt. Aktiviere diese Einstellung falls du Shop bezogene Nachrichten sehen willst.\n\nHinweis: Technisch gesehen, wird der ManaPlus-Shop mit gewöhnlichen Nachrichten mit besonderen Inhalt realisiert. Falls du diese Einstellung, deaktivierst kannst du diese Nachrichten sehen und  eine Idee davon bekommen wenn andere Spieler deinen Laden ansehen."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
+msgstr ""
+"Falls diese Einstellung aktiviert ist werden keine Nachrichten in Bezug auf "
+"den eingebauten ManaPlus-Shop im Chat angezeigt. Aktiviere diese Einstellung "
+"falls du Shop bezogene Nachrichten sehen willst.\n"
+"\n"
+"Hinweis: Technisch gesehen, wird der ManaPlus-Shop mit gewöhnlichen "
+"Nachrichten mit besonderen Inhalt realisiert. Falls du diese Einstellung, "
+"deaktivierst kannst du diese Nachrichten sehen und  eine Idee davon bekommen "
+"wenn andere Spieler deinen Laden ansehen."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:175
@@ -4206,8 +4376,13 @@ msgstr "MVP-Mitteilungen anzeigen"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
-msgstr "Aktviere diese Einstellung um MVP-Nachrichten vom Server zu erhalten.\n\nHinweis: MVP Nachrichten werden auf den TMV/Evol und ähnlichen Server nicht benutzt, deshalb macht diese Funktion wenig unterschied."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
+msgstr ""
+"Aktviere diese Einstellung um MVP-Nachrichten vom Server zu erhalten.\n"
+"\n"
+"Hinweis: MVP Nachrichten werden auf den TMV/Evol und ähnlichen Server nicht "
+"benutzt, deshalb macht diese Funktion wenig unterschied."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
@@ -4225,10 +4400,21 @@ msgstr "Alle Flüsternachrichten in Reitern anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
+"\n"
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
+msgstr ""
+"Falls diese Einstellung aktiviert ist werden alle Flüsternachrichten "
+"(private Nachrichten) in getrennten Reitern, - einen getrennten Reiter für "
+"jeden Spieler -, angezeigt. Falls diese Einstellung deaktivert ist, "
+"erscheinen alle Flüsternachrichten im globalen Reiter.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
-msgstr "Falls diese Einstellung aktiviert ist werden alle Flüsternachrichten (private Nachrichten) in getrennten Reitern, - einen getrennten Reiter für jeden Spieler -, angezeigt. Falls diese Einstellung deaktivert ist, erscheinen alle Flüsternachrichten im globalen Reiter.\n\nHinweis:Es ist bekannt, dass es sehr verwirrend sein kann, wenn alle Flüsternachrichten in einem globalen Reiter angezeigt werden. Überlege also zweimal ob du diese Funktion deaktivierst."
+"Hinweis:Es ist bekannt, dass es sehr verwirrend sein kann, wenn alle "
+"Flüsternachrichten in einem globalen Reiter angezeigt werden. Überlege also "
+"zweimal ob du diese Funktion deaktivierst."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:197
@@ -4238,10 +4424,17 @@ msgstr "Magische Nachrichten im Debugreiter aufzeichnen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
-msgstr "Falls diese Einstellung aktiviert ist werden Zauberspruch aufrufe im Debugreiter angezeigt. Wenn deaktiviert werden sie stattdessen im globalen Reiter angezeigt.\n\nHinweis: Dies hat keinen Einfluss darauf wie der Server auf zusamenhängende Zaubersprüche antwortet."
+msgstr ""
+"Falls diese Einstellung aktiviert ist werden Zauberspruch aufrufe im "
+"Debugreiter angezeigt. Wenn deaktiviert werden sie stattdessen im globalen "
+"Reiter angezeigt.\n"
+"\n"
+"Hinweis: Dies hat keinen Einfluss darauf wie der Server auf zusamenhängende "
+"Zaubersprüche antwortet."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:205
@@ -4251,10 +4444,19 @@ msgstr "Servermitteilungen im Debugreiter anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
+"\n"
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
+msgstr ""
+"Falls diese Einstellung aktiviert ist, werden Servernachrichten im "
+"Debugreiter des Chats angezeigt. Falls deaktiviert, zeigen Servernachrichten "
+"stattdessen im globalen Chat angezeigt. \n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
-msgstr "Falls diese Einstellung aktiviert ist, werden Servernachrichten im Debugreiter des Chats angezeigt. Falls deaktiviert, zeigen Servernachrichten stattdessen im globalen Chat angezeigt. \n\nHinweis: Bezugnehmend auf 4144 - Falls dies deaktiviert wird, könnte es sein dass du einige Debugnachrichten im Debugreiter vom Klienten verlieren könntest,  da es sich um gefälschte Servernachrichten handelt."
+"Hinweis: Bezugnehmend auf 4144 - Falls dies deaktiviert wird, könnte es sein "
+"dass du einige Debugnachrichten im Debugreiter vom Klienten verlieren "
+"könntest,  da es sich um gefälschte Servernachrichten handelt."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:215
@@ -4268,7 +4470,12 @@ msgid ""
 "words typical for trades will go to Trade tab. This will make General tab "
 "less noisy. If this setting is disabled, all trade related players messages "
 "will stay in General tab."
-msgstr "Aktiviert den Handelsreiter. Der Handelsreiter ist einfach gesagt ein Filter. Nachrichten, die typische Wörter zu handeln beinhalten werden im Handelsreiter angezeigt. Die macht den globalen Reiter ruhiger. Falls diese Einstellung deaktiviert wird bleiben handelsbezogene Nachrichten im globalen Reiter."
+msgstr ""
+"Aktiviert den Handelsreiter. Der Handelsreiter ist einfach gesagt ein "
+"Filter. Nachrichten, die typische Wörter zu handeln beinhalten werden im "
+"Handelsreiter angezeigt. Die macht den globalen Reiter ruhiger. Falls diese "
+"Einstellung deaktiviert wird bleiben handelsbezogene Nachrichten im globalen "
+"Reiter."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:224
@@ -4278,10 +4485,17 @@ msgstr "GM-Reiter einschalten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
-msgstr "Falls aktiviert, wird der GM-Reiter im Chat auftauchen. Es zeigt Text im Bezug auf GM-Aktivitäten an.\n\nHinweis: Diese Einstellung macht einen Unterschied für GMs (Game Master) seit dieser Reiter nur für GMs angezeigt wird."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
+msgstr ""
+"Falls aktiviert, wird der GM-Reiter im Chat auftauchen. Es zeigt Text im "
+"Bezug auf GM-Aktivitäten an.\n"
+"\n"
+"Hinweis: Diese Einstellung macht einen Unterschied für GMs (Game Master) "
+"seit dieser Reiter nur für GMs angezeigt wird."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:232
@@ -4291,10 +4505,13 @@ msgstr "Sprachenreiter einschalten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
-msgstr "Wenn du dieses Feature aktivierst, wird der Sprachenreiter auftauchen, falls der Server dieses Merkmal unterstützt."
+msgstr ""
+"Wenn du dieses Feature aktivierst, wird der Sprachenreiter auftauchen, falls "
+"der Server dieses Merkmal unterstützt."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:240
@@ -4304,10 +4521,18 @@ msgstr "Alle Sprachnachrichten anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
-msgstr "Falls diese Einstellung aktiviert ist und der Server verschiedene Reiter für verschiedene Sprachen unterstützt, wirst du Nachrichten in allen Sprachen sehen, ungeachtet deiner Spracheinstellungen.\n\nHinweis: Dies funktioniert nur auf Servern die, die Sprachenreiterfunktion unterstüzen."
+msgstr ""
+"Falls diese Einstellung aktiviert ist und der Server verschiedene Reiter für "
+"verschiedene Sprachen unterstützt, wirst du Nachrichten in allen Sprachen "
+"sehen, ungeachtet deiner Spracheinstellungen.\n"
+"\n"
+"Hinweis: Dies funktioniert nur auf Servern die, die Sprachenreiterfunktion "
+"unterstüzen."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:250
@@ -4317,10 +4542,17 @@ msgstr "Kampfreiter aktivieren"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
-msgstr "Falls dies aktiviert ist, wird der Kampfreiter im Chat erscheinen. Dieser Reiter zeigt kampfbezogene Nachrichten an wie Erhalt von Schaden und Erfahrung, falls Kampfnachrichten aktiviert sind.\n\nHinweis: Klient muss neu gestartet werden um diese Funktion zu aktivieren."
+msgstr ""
+"Falls dies aktiviert ist, wird der Kampfreiter im Chat erscheinen. Dieser "
+"Reiter zeigt kampfbezogene Nachrichten an wie Erhalt von Schaden und "
+"Erfahrung, falls Kampfnachrichten aktiviert sind.\n"
+"\n"
+"Hinweis: Klient muss neu gestartet werden um diese Funktion zu aktivieren."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:259
@@ -4333,7 +4565,10 @@ msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
 "battle messages will be displayed."
-msgstr "Wenn diese Einstellung aktiviert ist werden Nachrichten in Bezug zum Kampf wie Erhalt von Schaden oder Erfahrung im Debug- oder im Kampfreiter angezeigt. Falls deaktiviert werden keine Nachrichten zum Kampf angezeigt."
+msgstr ""
+"Wenn diese Einstellung aktiviert ist werden Nachrichten in Bezug zum Kampf "
+"wie Erhalt von Schaden oder Erfahrung im Debug- oder im Kampfreiter "
+"angezeigt. Falls deaktiviert werden keine Nachrichten zum Kampf angezeigt."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:267
@@ -4343,10 +4578,19 @@ msgstr "Falls nötig Chatreiter Größe ändern"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
-msgstr "Falls diese Funktion aktiviert ist, wird der Text im Chat automatisch an das Aussehen des Chateingabefeldes angepasst sobald du etwas schreibst oder das Chateingabefeld verschwindet. Wenn deaktiviert, wird das Chateingabefeld immer seinen Platz belegen, was sonst für Text nützlich sein könnte. Hinweis: Es geht um sprunghaftes Verhalten des Chats gegen weniger nutzbaren Platz für Text."
+msgstr ""
+"Falls diese Funktion aktiviert ist, wird der Text im Chat automatisch an das "
+"Aussehen des Chateingabefeldes angepasst sobald du etwas schreibst oder das "
+"Chateingabefeld verschwindet. Wenn deaktiviert, wird das Chateingabefeld "
+"immer seinen Platz belegen, was sonst für Text nützlich sein könnte. "
+"Hinweis: Es geht um sprunghaftes Verhalten des Chats gegen weniger nutzbaren "
+"Platz für Text."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:279
@@ -4368,7 +4612,9 @@ msgstr "Lokale Zeit benutzen"
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
-msgstr "Wenn dieses Funktion aktiviert ist, benutzen Zeitstempel im Chat die lokale Zeit. Wenn deaktiviert, wird die Serverzeit benutzt (oftmals ist das GMT+0)."
+msgstr ""
+"Wenn dieses Funktion aktiviert ist, benutzen Zeitstempel im Chat die lokale "
+"Zeit. Wenn deaktiviert, wird die Serverzeit benutzt (oftmals ist das GMT+0)."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:297
@@ -4378,10 +4624,15 @@ msgstr "Wörter hervorheben (Mit Komma trennen)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
-msgstr "Hier kannst du ein einige zusätzliche Wörter zur Hervorhebung bestimmen . Benutze durch Komma getrennte Wörter. \n\nHinweis: Häufige Hervorhebungen sind lästig - benutze sie mit Bedacht."
+msgstr ""
+"Hier kannst du ein einige zusätzliche Wörter zur Hervorhebung bestimmen . "
+"Benutze durch Komma getrennte Wörter. \n"
+"\n"
+"Hinweis: Häufige Hervorhebungen sind lästig - benutze sie mit Bedacht."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:305
@@ -4391,10 +4642,17 @@ msgstr "Globale Nachrichten von Name ignorieren (Mit Komma trennen)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
-msgstr "Diese Einstellung erlaubt dir einige globale Nachrichten zu ignorieren falls der bestimmte Sender (NPC, GM) dich zu sehr nervt. Globale Nachrichten werden stattdessen zum Debugreiter verschoben.\n\nHinweis: Unvorsichtige Verwendung dieser Funktion, kann dazu führen, dass du wichtige Ankündigungen verpasst!"
+msgstr ""
+"Diese Einstellung erlaubt dir einige globale Nachrichten zu ignorieren falls "
+"der bestimmte Sender (NPC, GM) dich zu sehr nervt. Globale Nachrichten "
+"werden stattdessen zum Debugreiter verschoben.\n"
+"\n"
+"Hinweis: Unvorsichtige Verwendung dieser Funktion, kann dazu führen, dass du "
+"wichtige Ankündigungen verpasst!"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:314
@@ -4404,10 +4662,20 @@ msgstr "Emotes im Chat anzeigen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
+"\n"
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
+msgstr ""
+"Falls diese Einstellung aktivert ist wird eine Schaltfläche in der Nähe des "
+"Texteingabefeldes erscheinen. Diese Schaltfläche ruft das Gestaltungsfenster "
+"auf. Dies erlaubt dir Smilies in den Chat einzufügen und deinen Text zu "
+"formatieren.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
-msgstr "Falls diese Einstellung aktivert ist wird eine Schaltfläche in der Nähe des Texteingabefeldes erscheinen. Diese Schaltfläche ruft das Gestaltungsfenster auf. Dies erlaubt dir Smilies in den Chat einzufügen und deinen Text zu formatieren.\n\nHinweis: Das Fenster kann auch durch die F1 Taste, während du im Chat schreibst, aufgerufen werden."
+"Hinweis: Das Fenster kann auch durch die F1 Taste, während du im Chat "
+"schreibst, aufgerufen werden."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:324
@@ -4419,7 +4687,10 @@ msgstr "NdT Servernachricht beim Start anzeigen"
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
-msgstr "Wenn diese Einstellung ausgewählt ist, wird der Klient die Server NdT (Nachricht des Tages) anzeigen, sobald du auf dem Server bist. Deaktiveren, um die NdT nicht anzuzeigen."
+msgstr ""
+"Wenn diese Einstellung ausgewählt ist, wird der Klient die Server NdT "
+"(Nachricht des Tages) anzeigen, sobald du auf dem Server bist. Deaktiveren, "
+"um die NdT nicht anzuzeigen."
 
 #. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
@@ -4495,11 +4766,6 @@ msgid "Unassign"
 msgstr "Zuweisen rückgängig machen"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "Standard"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Alle Tastenbelegungen zurücksetzen"
@@ -4520,7 +4786,9 @@ msgstr "Tastenkonflikt erkannt."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Konflikt zwischen \"%s\" und \"%s\" Tasten. Ändere die Tastenbelegung oder das Spiel lässt sich nicht richtig steuern."
+msgstr ""
+"Konflikt zwischen \"%s\" und \"%s\" Tasten. Ändere die Tastenbelegung oder "
+"das Spiel lässt sich nicht richtig steuern."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -4905,7 +5173,9 @@ msgstr "Unterstützung für Bots"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Enable guild bot support and disable native guild support"
-msgstr "Botunterstützung von Gilden aktivieren und serverseitige Gildenunterstüzung deaktiveren"
+msgstr ""
+"Botunterstützung von Gilden aktivieren und serverseitige Gildenunterstüzung "
+"deaktiveren"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:313
@@ -5068,7 +5338,9 @@ msgstr "Hardwarebeschleunigung"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 msgid "Enable opacity cache (Software, can use much memory)"
-msgstr "Transparenz des Zwischenspeichers aktivieren (Software, kann viel Speicher verbrauchen)"
+msgstr ""
+"Transparenz des Zwischenspeichers aktivieren (Software, kann viel Speicher "
+"verbrauchen)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:79
@@ -5128,7 +5400,9 @@ msgstr "Zwischenspeicher für Wesen deaktivieren (Software)"
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:129
 msgid "Different options (enable or disable can improve performance)"
-msgstr "Verschiedene Optionen (Aktivieren oder deaktivieren kann die Leistung verbessern)"
+msgstr ""
+"Verschiedene Optionen (Aktivieren oder deaktivieren kann die Leistung "
+"verbessern)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:134
@@ -5153,12 +5427,15 @@ msgstr "Texturenatlas aktiveren (OpenGL)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Cache all sprites per map (can use additional memory)"
-msgstr "Alle Sprites pro Karte zwischenspeichern (Kann zusätzlichen Speicher verbrauchen)"
+msgstr ""
+"Alle Sprites pro Karte zwischenspeichern (Kann zusätzlichen Speicher "
+"verbrauchen)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:155
 msgid "Cache all sounds (can use additional memory)"
-msgstr "Alle Klänge zwischenspeichern (Kann zusätzlichen Speicher  verbrauchen)"
+msgstr ""
+"Alle Klänge zwischenspeichern (Kann zusätzlichen Speicher  verbrauchen)"
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:160
@@ -5568,13 +5845,17 @@ msgstr "Kein(e)"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Das Wechseln in den Fenstermodus sowie das Wiederherstellen der vorherigen Auflösung schlug fehl!"
+msgstr ""
+"Das Wechseln in den Fenstermodus sowie das Wiederherstellen der vorherigen "
+"Auflösung schlug fehl!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Das Wechseln in den Vollbildmodus sowie das Wiederherstellen der vorherigen Auflösung schlug fehl!"
+msgstr ""
+"Das Wechseln in den Vollbildmodus sowie das Wiederherstellen der vorherigen "
+"Auflösung schlug fehl!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5594,7 +5875,9 @@ msgstr "Wechsle zu OpenGL"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:283
 msgid "Applying change to OpenGL requires restart."
-msgstr "Änderungen an OpenGL werden erst nach einem Neustart der Anwendung übernommen."
+msgstr ""
+"Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
+"übernommen."
 
 #. TRANSLATORS: resolution question dialog
 #: src/gui/widgets/tabs/setup_video.cpp:368
@@ -5615,7 +5898,9 @@ msgstr "Bildschirmauflösung wurde geändert"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Einige Fenster könnten verschoben werden um in die herabgesetzte Auflösung zu passen."
+msgstr ""
+"Einige Fenster könnten verschoben werden um in die herabgesetzte Auflösung "
+"zu passen."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -5784,70 +6069,70 @@ msgid "Atk"
 msgstr "ANG"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr "Bevorzugte Monster"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr "Monster angreifen"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr "Monster ignorieren"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr "Freunde: %u/%u"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr "Spieler: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "%s in die Gilde %s eingeladen."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Gilde %s hat Abbruch beantragt."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "Mitglied in die Gilde einladen"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Wen willst du in die Gilde %s einladen?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "Gilde verlassen?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bist du sicher, dass du die Gilde %s verlassen willst?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr "Mitglieder: %u/%u"
@@ -5859,41 +6144,41 @@ msgid "Nav"
 msgstr "NAV"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr "Portale: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Benutzer %s zur Gruppe einladen."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Gruppe %s hat Abbruch beantragt."
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "Mitglied zur Gruppe einladen"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Wen willst du zur Gruppe %s einladen?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "Gruppe verlassen?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Bist du sicher, dass du die Gruppe %s verlassen willst?"
@@ -5905,17 +6190,17 @@ msgid "Pik"
 msgstr "AH"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr "Gegenstände aufheben"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr "Gegenstände ignorieren"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr "Sichtbare Spieler: %d"
@@ -6148,10 +6433,8 @@ msgstr "Menge:"
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Erstellen"
 
@@ -6268,8 +6551,7 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6287,8 +6569,7 @@ msgstr "Bitte verteile %d Punkte"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6314,8 +6595,7 @@ msgstr "Schau:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr "W"
 
@@ -6414,7 +6694,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "HP: %u/%u\nMP: %u/%u\nLevel: %u\nErfahrung: %u\nGeld: %s"
+msgstr ""
+"HP: %u/%u\n"
+"MP: %u/%u\n"
+"Level: %u\n"
+"Erfahrung: %u\n"
+"Geld: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6480,11 +6765,6 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr "Ziel"
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr "Net"
@@ -6516,8 +6796,7 @@ msgstr "Server bearbeiten"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -6586,8 +6865,8 @@ msgstr "Schriften"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -6883,15 +7162,13 @@ msgstr "Betreff:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr "Geld:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr "Gegenstand:"
@@ -7293,173 +7570,138 @@ msgid "Up"
 msgstr "Hoch"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Fähigkeitspunkte verfügbar: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr "Fähigkeitenset %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "Fähigkeit %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Fähigkeit fehlgeschlagen: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, 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:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr "Text: "
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr "S"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "Einladen"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Gruppeneinladung von %s angenommen."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Gruppeneinladung von %s abgelehnt."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Gildeneinladung von %s angenommen."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Gildeneinladung von %s abgelehnt."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Gilde mit den Namen %s erstellt."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "Gruppe mit dem Namen %s erstellt."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "Gildenname"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "Namen deiner Gilde wählen."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr "Gildenanfrage empfangen, aber es gibt bereits eine Anfrage."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s hat dich eingeladen, der Gilde %s beizutreten."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "Gildeneinladung annehmen"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "Gruppenanfrage empfangen, aber es gibt bereits eine Anfrage."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "Du wurdest zu einer Gruppe eingeladen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Du wurdest zu der Gruppe %s eingeladen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s hat dich in seine Gruppe eingeladen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s hat dich eingeladen, an der Gruppe %s teilzunehmen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "Gruppeneinladung annehmen"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "Konnte keine Gruppe erstellen. Du bist schon in einer Gruppe."
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "Gruppenname"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "Name deiner Gruppe wählen."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7599,14 +7841,17 @@ msgstr "Du hast nicht genügend Geld."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser Gegenstände hinzufügen."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
+"Gegenstände hinzufügen."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not trade equipped items."
-msgstr "Gegenstand hinzufügen fehlgeschlagen. Du kannst micht mit ausgerüsteten Gegenständen handeln."
+msgstr ""
+"Gegenstand hinzufügen fehlgeschlagen. Du kannst micht mit ausgerüsteten "
+"Gegenständen handeln."
 
 #. TRANSLATORS: updater window name
 #: src/gui/windows/updaterwindow.cpp:171
@@ -7686,25 +7931,25 @@ msgstr "Welt auswählen"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "Taste_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr "JKnopf%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr "Unbekannte Taste"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr "JK%d"
@@ -7712,7 +7957,7 @@ msgstr "JK%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "UTaste"
 
@@ -8855,7 +9100,8 @@ msgstr "Fenster: Wegwerfen leeren"
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr "Zugriff verweigert. Wahrscheinlich sind zu viele Spieler auf dem Server."
+msgstr ""
+"Zugriff verweigert. Wahrscheinlich sind zu viele Spieler auf dem Server."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:55
@@ -8870,7 +9116,9 @@ msgstr "Unbekannter Charakterserver Fehler."
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Fehlschlag beim Erstellen des Charakters. Wahrscheinlich wird der Name schon benutzt."
+msgstr ""
+"Fehlschlag beim Erstellen des Charakters. Wahrscheinlich wird der Name schon "
+"benutzt."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:160
@@ -8923,7 +9171,9 @@ msgstr "Konnte nicht flüstern. Ignoriert von %s."
 #. TRANSLATORS: chat message
 #: src/net/ea/chatrecv.cpp:114
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "Flüsternachricht konnte nicht gesendet werden. Du wirst von allen Spielern ignoriert."
+msgstr ""
+"Flüsternachricht konnte nicht gesendet werden. Du wirst von allen Spielern "
+"ignoriert."
 
 #. TRANSLATORS: error header
 #: src/net/ea/gamerecv.cpp:67
@@ -9028,7 +9278,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Du wurdest bis %s gebannt.\nBitte kontaktiere das GM-Team via der Foren."
+msgstr ""
+"Du wurdest bis %s gebannt.\n"
+"Bitte kontaktiere das GM-Team via der Foren."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -9943,17 +10195,23 @@ msgstr "Unbehandelter Pakethandelabbruch mit %s"
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:287
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Gegenstand hinzufügen fehlgeschlagen: Der Handelspartner kann nichts mehr tragen."
+msgstr ""
+"Gegenstand hinzufügen fehlgeschlagen: Der Handelspartner kann nichts mehr "
+"tragen."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:291
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Gegenstand hinzufügen fehlgeschlagen. Handelspartner hat keinen freien Platz in seinem Inventar."
+msgstr ""
+"Gegenstand hinzufügen fehlgeschlagen. Handelspartner hat keinen freien Platz "
+"in seinem Inventar."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:295
 msgid "Failed adding item. You can't trade this item."
-msgstr "Gegenstand hinzufügen fehlgeschlagen. Du kannst diesen Gegenstand nicht handeln."
+msgstr ""
+"Gegenstand hinzufügen fehlgeschlagen. Du kannst diesen Gegenstand nicht "
+"handeln."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:299
@@ -10115,14 +10373,18 @@ msgstr "Karte eingesteckt."
 msgid ""
 "Deposit failed. You probably don't have this amount of money with you right "
 "now."
-msgstr "Einzahlen fehlgeschlagen. Vielleicht hast du diese Menge an Geld gerade nicht dabei."
+msgstr ""
+"Einzahlen fehlgeschlagen. Vielleicht hast du diese Menge an Geld gerade "
+"nicht dabei."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:427
 msgid ""
 "Withdraw failed. You probably don't have this amount of money in the bank "
 "right now."
-msgstr "Abheben fehlgeschlagen. Vielleicht hast du gerade diese Menge an Geld nicht auf der Bank."
+msgstr ""
+"Abheben fehlgeschlagen. Vielleicht hast du gerade diese Menge an Geld nicht "
+"auf der Bank."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:432
@@ -10137,7 +10399,8 @@ msgstr "Erstellen des Verkaufsstandes fehlgeschlagen. Zu viel Gewicht."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:440
 msgid "Buying store create failed. No items in store."
-msgstr "Erstellen des Verkaufsstandes fehlgeschlagen. Keine Gegenstände im Laden."
+msgstr ""
+"Erstellen des Verkaufsstandes fehlgeschlagen. Keine Gegenstände im Laden."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:444
@@ -10164,7 +10427,9 @@ msgstr "Der Handel ist fehlgeschlagen."
 msgid ""
 "The trade failed, because the entered amount of item is higher, than the "
 "buyer is willing to buy."
-msgstr "Der Handel ist fehlgeschlagen, da die eingegebene Anzahl von Gegenständen höher ist, als die Anzahl, die der Käufer kaufen will."
+msgstr ""
+"Der Handel ist fehlgeschlagen, da die eingegebene Anzahl von Gegenständen "
+"höher ist, als die Anzahl, die der Käufer kaufen will."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:465
@@ -10189,7 +10454,8 @@ msgstr "Keine passenden Läden wurden gefunden."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:483
 msgid "There are too many results. Please enter more detailed search term."
-msgstr "Es gibt zu viele Ergebnisse. Bitte einen genaueren Suchbegriff eingeben."
+msgstr ""
+"Es gibt zu viele Ergebnisse. Bitte einen genaueren Suchbegriff eingeben."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:488
@@ -10401,12 +10667,15 @@ msgstr "Verbesserung unbekannt für Gegenstand %s."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:650
 msgid "You can't add item to card because weight too high."
-msgstr "Gegenstand kann nicht zu Karte hinzugefügt werden, da das Gewicht zu hoch ist."
+msgstr ""
+"Gegenstand kann nicht zu Karte hinzugefügt werden, da das Gewicht zu hoch "
+"ist."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:654
 msgid "You can't add item to card because too many items."
-msgstr "Gegenstand kann nicht zu Karte hinzugefügt werden - zu viele Gegenstände."
+msgstr ""
+"Gegenstand kann nicht zu Karte hinzugefügt werden - zu viele Gegenstände."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:658
@@ -10580,7 +10849,9 @@ msgstr "Du kannst das Kind nicht adoptieren. Dein Level ist du niedrig."
 #: src/resources/notifications.h:816
 msgid ""
 "Child adoption failed. This player is already married and can't be a baby."
-msgstr "Adoption fehlgeschlagen. Dieser Spieler ist bereits verheiratet und kann keine Baby mehr sein."
+msgstr ""
+"Adoption fehlgeschlagen. Dieser Spieler ist bereits verheiratet und kann "
+"keine Baby mehr sein."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:821
@@ -10590,38 +10861,41 @@ msgstr "Standort für Warp Fähigkeit gespeichert."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
 msgid "Error saving location. Not enough skill level."
-msgstr "Der Standort konnte nicht gespeichert werden. Der Fähigkeitenlevel ist ungenügend."
+msgstr ""
+"Der Standort konnte nicht gespeichert werden. Der Fähigkeitenlevel ist "
+"ungenügend."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
 msgid "Error saving location. You do not have warp skill."
-msgstr "Standort konnte nicht gespeichert werden. Der Skill Level ist ungenügend."
+msgstr ""
+"Standort konnte nicht gespeichert werden. Der Skill Level ist ungenügend."
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr "Lvl: %d / %d"
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr "Unbekannt:"
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr " / Mana: -%d"
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr "Reichweite: %d"
@@ -10632,11 +10906,6 @@ msgid "Ground"
 msgstr "Boden"
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr "Selbst"
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr "Unbenutzt"
@@ -10655,7 +10924,8 @@ msgstr "TargetTrap"
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
+msgstr ""
+"Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10711,3 +10981,30 @@ msgstr "%d Sekunden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d Sekunden"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Name der Gilde fehlt."
+
+#~ msgid "Invite"
+#~ msgstr "Einladen"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "Gilde mit den Namen %s erstellt."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "Gruppe mit dem Namen %s erstellt."
+
+#~ msgid "Guild Name"
+#~ msgstr "Gildenname"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "Namen deiner Gilde wählen."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "Konnte keine Gruppe erstellen. Du bist schon in einer Gruppe."
+
+#~ msgid "Party Name"
+#~ msgstr "Gruppenname"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "Name deiner Gruppe wählen."
diff --git a/po/es.po b/po/es.po
index e27a592c0..7758e8bb8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # 0x0Eddine <salahbubuli44@gmail.com>, 2012,2014-2015
 # Andrei Karas <akaras@inbox.ru>, 2011
@@ -24,14 +24,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/es/)\n"
+"Language-Team: Spanish (http://www.transifex.com/akaras/manaplus/language/"
+"es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -45,7 +46,6 @@ msgstr "Archivo subido"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -65,10 +65,9 @@ msgstr "Archivo subido"
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -117,80 +116,88 @@ msgid "Uploaded log into:"
 msgstr "Registro subido a:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
-msgstr "Deshabilitada opción para mostrar última vez visto. Habilítala en Jugadores / \"Registrar ID de jugador y última vez visto\"."
+msgstr ""
+"Deshabilitada opción para mostrar última vez visto. Habilítala en "
+"Jugadores / \"Registrar ID de jugador y última vez visto\"."
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr "No habías visto a este jugador."
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr "Última vez que viste a %s: %s"
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr "¡No se puede enviar un mensaje vacío como susurro ni al canal!"
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr "¡No se puede crear la pestaña de susurro \"%s\"! Probablemente ya existe."
+msgstr ""
+"¡No se puede crear la pestaña de susurro \"%s\"! Probablemente ya existe."
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Falta el nombre del grupo."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Crear grupo"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Falta el nombre del gremio."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Gremio del objetivo:"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Por favor, especifique un nombre."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "Volver a alternar el chat."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "El mensaje cierra el chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "Volver ahora a cambiar de chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "Mensaje ahora cierra el chat."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr "sin sombrero equipado."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr "tiene puesto el sombrero %s."
@@ -464,8 +471,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -549,8 +556,8 @@ msgstr "Ayuda"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -737,7 +744,8 @@ msgstr "  -u --skip-update    : Saltarse las descargas de actualización"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Carpeta desde la que se cargan los datos del juego"
+msgstr ""
+"  -d --data           : Carpeta desde la que se cargan los datos del juego"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:99
@@ -747,7 +755,8 @@ msgstr "  -L --localdata-dir  : Carpeta para usar los datos locales"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Carpeta donde se guardan las capturas de pantalla"
+msgstr ""
+"     --screenshot-dir : Carpeta donde se guardan las capturas de pantalla"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:106
@@ -762,7 +771,8 @@ msgstr "     --renderer: Establecer tipo de renderizador"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --tests          : Comenzar a probar controladores y auto configurar"
+msgstr ""
+"  -T --tests          : Comenzar a probar controladores y auto configurar"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -1252,21 +1262,23 @@ msgstr "Mensaje"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr "Revivir"
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Estás cargando con más de la mitad de tu peso. Eres incapaz de recobrar la salud."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Estás cargando con más de la mitad de tu peso. Eres incapaz de recobrar la "
+"salud."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud."
+msgstr ""
+"Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1277,8 +1289,7 @@ msgstr "Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la s
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "predeterminado"
 
@@ -1439,8 +1450,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(predeterminado)"
 
@@ -1746,8 +1757,8 @@ msgstr "Sala de chat: %s"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1766,58 +1777,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr "Partículas: %u"
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "Crear grupo"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "Cancelar"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1839,7 +1798,7 @@ msgstr "Tarjetas: "
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1853,8 +1812,8 @@ msgstr "Intercambio"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "Atacar"
@@ -1865,36 +1824,36 @@ msgstr "Atacar"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "Susurrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "Curar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "Expulsar del gremio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 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:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "Invitar al gremio"
 
@@ -1902,7 +1861,7 @@ msgstr "Invitar al gremio"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "Eliminar"
 
@@ -1919,9 +1878,9 @@ msgstr "Eliminar"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "Mover"
@@ -1930,7 +1889,7 @@ msgstr "Mover"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Hablar"
@@ -1945,7 +1904,7 @@ msgstr "Hablar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1963,7 +1922,7 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1975,26 +1934,26 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr "Agregar comentario"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 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:320
+#: src/gui/popups/popupmenu.cpp:321
 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:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "Agregar a la lista de ataque"
 
@@ -2002,19 +1961,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:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 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:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr "Moverse al maestro"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr "Fuego"
 
@@ -2022,7 +1981,7 @@ msgstr "Fuego"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr "Alimentar"
 
@@ -2032,8 +1991,8 @@ msgstr "Alimentar"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "Renombrar"
@@ -2042,13 +2001,13 @@ msgstr "Renombrar"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr "Matar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr "Soltar botín"
 
@@ -2056,7 +2015,7 @@ msgstr "Soltar botín"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2069,7 +2028,7 @@ msgstr "Quitárselo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr "Regresar al huevo"
 
@@ -2077,39 +2036,88 @@ 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:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "Agregar nombre al chat"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "Cancelar"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Jugadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Expulsar del grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "Recoger"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Añadir al chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "Mapa Objeto"
 
@@ -2119,28 +2127,28 @@ msgstr "Mapa Objeto"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "Quitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr "Saltar a"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr "Mover cámara"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr "Restaurar cámara"
 
@@ -2149,7 +2157,7 @@ msgstr "Restaurar cámara"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2157,69 +2165,68 @@ msgstr "Vestimenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr "Limpiar vestimenta"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Hechizos"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 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:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "Limpiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "Deshabilitar resaltado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr "Habilitar resaltado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 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:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "Remover nombre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "Habilitar ausencia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 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:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "Dejar"
 
@@ -2229,116 +2236,116 @@ msgstr "Dejar"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr "Copiar al portapapeles"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "Cambiar posición del gremio"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr "ventana"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr "Desbloquear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr "Bloquear"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr "Mostrar emoticones para:"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr "Jugador"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr "Mascota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr "Homúnculo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr "Mercenario"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 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:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "Nombre:                  "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr "Comentario del jugador    "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr "Comentario:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 msgid "Add to trade"
 msgstr "Agregar al intercambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1745
+#: src/gui/popups/popupmenu.cpp:1762
 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:1750
+#: src/gui/popups/popupmenu.cpp:1767
 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:1754
+#: src/gui/popups/popupmenu.cpp:1771
 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:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr "Agregar todo al intercambio"
 
@@ -2347,8 +2354,8 @@ msgstr "Agregar todo al intercambio"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2356,63 +2363,63 @@ msgstr "Almacenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "Almacenar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "Almacenar la mitad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr "Almacenar todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Almacenar todo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "Recuperar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "Recuperar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 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:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr "Recuperar todo-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Recuperar todo"
 
@@ -2423,17 +2430,17 @@ msgstr "Recuperar todo"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr "Limpiar ventana de drop"
 
@@ -2442,43 +2449,43 @@ msgstr "Limpiar ventana de drop"
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr "Abrir configuraciones de la barra amarilla"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 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:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr "Copiar al chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "Subir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr "Bajar"
 
@@ -2486,175 +2493,247 @@ msgstr "Bajar"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr "Desvestir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr "Abrir enlace"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr "Mostrar ventana"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr "Habilidad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+#, fuzzy
+msgid "Skill level..."
+msgstr "Establecer nivel de habilidad"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+#, fuzzy
+msgid "Select skill level"
 msgstr "Establecer nivel de habilidad"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr "Nivel máximo"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "Predeterminado"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr "Objetivo"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Corregir posición automáticamente"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr "Ego"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 msgid "Disregard"
 msgstr "Desatender"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 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:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr "Lista negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr "Fijar como enemigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr "Borrar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "Ser amigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "Dejar de ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "Invitar al grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr "Unirse al chat %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "Mostrar vestimenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr "Remover de lista de recogido"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 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:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr "Desproteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr "Proteger artículo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Tirar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "Tirar todo"
 
@@ -2662,38 +2741,38 @@ msgstr "Tirar todo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Tirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr "Mostrar %s"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr "Información de la cuenta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr "Nivel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr "Atributos"
 
@@ -2702,7 +2781,7 @@ msgstr "Atributos"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2711,7 +2790,7 @@ msgstr "Inventario"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr "Almacenamiento"
 
@@ -2720,7 +2799,7 @@ msgstr "Almacenamiento"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2729,31 +2808,31 @@ msgstr "Mochila"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Comandos"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr "Comandos del personaje"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr "Atrás"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr "Localizar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr "Chequear IP"
 
@@ -2761,7 +2840,7 @@ msgstr "Chequear IP"
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr "Ir a"
 
@@ -2769,109 +2848,109 @@ msgstr "Ir a"
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr "Llamar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr "Nombrar líder del grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr "Mostrar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr "Silenciar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr "Inmortal"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr "Encarcelar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr "Sacar de la cárcel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr "Asesino"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr "Asesinable"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr "Poner a salvo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr "Transportar a zona segura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr "Transportar aleatoriamente"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2879,31 +2958,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr "Expulsar"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr "Enmudecer a %s"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr "Enmudecer %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr "Desenmudecer %d"
@@ -2912,19 +2991,19 @@ msgstr "Desenmudecer %d"
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr "Disfraz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2936,8 +3015,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2945,63 +3024,82 @@ msgstr "Información"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr "Buscar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr "Quién lo soltó"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr "Comandos GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr "Escribir correo a..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr "Domar mascota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr "Adoptar hijo"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "¿Dejar grupo?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr "Nivel: %d / %d"
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr "Nivel: Desconocido"
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Corregir posición automáticamente"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "Tipo: %s"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3536,6 +3634,11 @@ msgstr "Lenguaje"
 msgid "Party"
 msgstr "Grupo"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Falta el nombre del grupo."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3544,15 +3647,13 @@ msgstr "Compartir artículos habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Compartir artículos deshabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "No se puede compartir artículos."
 
@@ -3563,22 +3664,19 @@ msgstr "Compartir artículos desconocido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Compartir experiencia habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Compartir experiencia deshabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "No se puede compartir experiencia."
 
@@ -4007,7 +4105,10 @@ msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
 "Hit Enter or hover mouse to show chat again."
-msgstr "La ventana del chat será ocultada automáticamente cuando no esté en uso.\n\nPresiona Enter o pasa el ratón por encima para mostrarla nuevamente."
+msgstr ""
+"La ventana del chat será ocultada automáticamente cuando no esté en uso.\n"
+"\n"
+"Presiona Enter o pasa el ratón por encima para mostrarla nuevamente."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4019,15 +4120,19 @@ msgstr "Proteger foco del chat"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
-msgstr "Habilita la protección agresiva del foco de entrada en la ventana del chat.\n\nNota: A ninguna otra entrada de texto se le permitirá recibir el foco de entrada mientras estés escribiendo en la ventana del chat."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
+msgstr ""
+"Habilita la protección agresiva del foco de entrada en la ventana del chat.\n"
+"\n"
+"Nota: A ninguna otra entrada de texto se le permitirá recibir el foco de "
+"entrada mientras estés escribiendo en la ventana del chat."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Colores"
 
@@ -4041,7 +4146,10 @@ msgstr "Remover los colores de los mensajes recibidos en el chat"
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
-msgstr "Habilita este ajuste para desnudar los colores de los mensajes que llegan al chat. Si está habilitado, todos los mensajes usarán el color de texto predeterminado."
+msgstr ""
+"Habilita este ajuste para desnudar los colores de los mensajes que llegan al "
+"chat. Si está habilitado, todos los mensajes usarán el color de texto "
+"predeterminado."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:77
@@ -4051,21 +4159,26 @@ msgstr "Mostrar lista de colores del chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
-msgstr "Permitir utilizar los comandos de magia y GM en todas las pestañas del chat"
+msgstr ""
+"Permitir utilizar los comandos de magia y GM en todas las pestañas del chat"
 
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
-msgstr "Habilita esta configuración para poder escribir hechizos y comandos GM en cualquier pestaña."
+msgstr ""
+"Habilita esta configuración para poder escribir hechizos y comandos GM en "
+"cualquier pestaña."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:98
@@ -4080,9 +4193,11 @@ msgstr "Límite máx. de caracteres por línea en el chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4093,7 +4208,9 @@ msgstr "Límite máx. de líneas en el chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4124,7 +4241,9 @@ msgstr "Habilitar registro del chat de depuración"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
-msgstr "Si habilitas esto, el historial de la pestaña de depuración también será registrada en el disco."
+msgstr ""
+"Si habilitas esto, el historial de la pestaña de depuración también será "
+"registrada en el disco."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:137
@@ -4134,9 +4253,12 @@ msgstr "Mostrar historial del chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
-msgstr "Si esta configuración es habilitada, el cliente cargará el contenido de viejas pestañas del chat desde los registros al inicio en vez de iniciar con pestañas vacías."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
+msgstr ""
+"Si esta configuración es habilitada, el cliente cargará el contenido de "
+"viejas pestañas del chat desde los registros al inicio en vez de iniciar con "
+"pestañas vacías."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:144
@@ -4146,9 +4268,11 @@ msgstr "Mostrar mensajes de conexión de miembros del grupo"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4159,10 +4283,17 @@ msgstr "Mostrar mensajes de conexión de miembros del gremio"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
-msgstr "Si este ajuste se habilita, se mostrarán los cambios de estado de conexión de los miembros del gremio en la pestaña Gremio del chat.\n\nEsto agrega algunos sonidos extra al chat, pero te permite notar cuando tus compañeros se conectan."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
+msgstr ""
+"Si este ajuste se habilita, se mostrarán los cambios de estado de conexión "
+"de los miembros del gremio en la pestaña Gremio del chat.\n"
+"\n"
+"Esto agrega algunos sonidos extra al chat, pero te permite notar cuando tus "
+"compañeros se conectan."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:161
@@ -4177,9 +4308,13 @@ msgstr "Ocultar mensajes de la tienda"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4192,7 +4327,8 @@ msgstr "Mostrar mensajes MVP"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4211,9 +4347,12 @@ msgstr "Poner todos los susurros en pestañas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4224,7 +4363,8 @@ msgstr "Registrar mensajes de magia en la pestaña del depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4237,9 +4377,11 @@ msgstr "Mostrar los mensajes del servidor en la pestaña del depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4264,9 +4406,11 @@ msgstr "Habilitar pestaña para GM"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4277,10 +4421,15 @@ msgstr "Habilitar pestaña de lenguaje"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
-msgstr "Si esta característica es habilitada, la pestaña de lenguaje aparecerá si el servidor la soporta.\n\nNota: Por ahora, sólo es soportado por el servidor Evol."
+msgstr ""
+"Si esta característica es habilitada, la pestaña de lenguaje aparecerá si el "
+"servidor la soporta.\n"
+"\n"
+"Nota: Por ahora, sólo es soportado por el servidor Evol."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:240
@@ -4290,7 +4439,9 @@ msgstr "Mostrar mensajes de todos los lenguajes"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4303,7 +4454,9 @@ msgstr "Habilitar pestaña de batalla"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4319,7 +4472,11 @@ msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
 "battle messages will be displayed."
-msgstr "Si se habilitada esta preferencia, los mensajes relacionados a las batallas, como el daño o ganancia de experiencia, serán mostrados en la pestaña Depuración o Batalla. Si está deshabilitado, ningún mensaje de batalla será mostrado."
+msgstr ""
+"Si se habilitada esta preferencia, los mensajes relacionados a las batallas, "
+"como el daño o ganancia de experiencia, serán mostrados en la pestaña "
+"Depuración o Batalla. Si está deshabilitado, ningún mensaje de batalla será "
+"mostrado."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:267
@@ -4329,7 +4486,10 @@ msgstr "Si hace falta, cambia el tamaño de las pestañas del chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4354,7 +4514,10 @@ msgstr "Usar hora local"
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
-msgstr "Si esta función es habilitada, las marcas de tiempo en el chat usarán la hora local. Si es deshabilitado, se usará la hora del servidor (mayormente es GTM+0)."
+msgstr ""
+"Si esta función es habilitada, las marcas de tiempo en el chat usarán la "
+"hora local. Si es deshabilitado, se usará la hora del servidor (mayormente "
+"es GTM+0)."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:297
@@ -4364,10 +4527,15 @@ msgstr "Resaltar palabras (separadas por coma)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
-msgstr "Aquí puedes especificar algunas palabras extra que también serán resaltadas. Usa comas para separar las palabras.\n\nNota: Los resaltados frecuentes pueden ser molestos; úsalo con precaución."
+msgstr ""
+"Aquí puedes especificar algunas palabras extra que también serán resaltadas. "
+"Usa comas para separar las palabras.\n"
+"\n"
+"Nota: Los resaltados frecuentes pueden ser molestos; úsalo con precaución."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:305
@@ -4377,7 +4545,8 @@ msgstr "Ignorar nombres globalmente (separados por coma)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4390,9 +4559,12 @@ msgstr "Mostrar botón de emoticonos en el chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4405,7 +4577,10 @@ msgstr "Mostrar el mensaje motd del servidor al iniciar"
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
-msgstr "Si esta configuración es habilitada, el cliente mostrará el MOTD (MDD, mensaje del día) una vez que te conectes al servidor. Deshabilita para ocultar el MOTD."
+msgstr ""
+"Si esta configuración es habilitada, el cliente mostrará el MOTD (MDD, "
+"mensaje del día) una vez que te conectes al servidor. Deshabilita para "
+"ocultar el MOTD."
 
 #. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
@@ -4481,11 +4656,6 @@ msgid "Unassign"
 msgstr "Retirar"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "Predeterminado"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Restablecer todas las teclas"
@@ -4506,7 +4676,9 @@ msgstr "Detectado conflicto de teclas."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Conflicto con las teclas \"%s\" e \"%s\" . Resuélvelo, o el juego podría comportarse en un modo extraño."
+msgstr ""
+"Conflicto con las teclas \"%s\" e \"%s\" . Resuélvelo, o el juego podría "
+"comportarse en un modo extraño."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -4876,7 +5048,9 @@ msgstr "NPC"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:295
 msgid "Cycle npc targets"
-msgstr "Seleccionar cíclicamente los npcs en derredor, no necesariamente al más cercano"
+msgstr ""
+"Seleccionar cíclicamente los npcs en derredor, no necesariamente al más "
+"cercano"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:299
@@ -4891,7 +5065,8 @@ msgstr "Soporte de bots"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Enable guild bot support and disable native guild support"
-msgstr "Habilitar soporte para el bot 'guild' y deshabilitar soporte de gremio nativo"
+msgstr ""
+"Habilitar soporte para el bot 'guild' y deshabilitar soporte de gremio nativo"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:313
@@ -5114,7 +5289,8 @@ msgstr "Deshabilitar caché de criaturas (Software)"
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:129
 msgid "Different options (enable or disable can improve performance)"
-msgstr "Opciones diferentes (habitar o deshabilitar puede mejorar el rendimiento)"
+msgstr ""
+"Opciones diferentes (habitar o deshabilitar puede mejorar el rendimiento)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:134
@@ -5139,7 +5315,8 @@ msgstr "Habilitar atlas de texturas (OpenGL)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Cache all sprites per map (can use additional memory)"
-msgstr "Almacenar en caché todos los sprites por mapa (puede usar memoria adicional)"
+msgstr ""
+"Almacenar en caché todos los sprites por mapa (puede usar memoria adicional)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:155
@@ -5275,7 +5452,9 @@ msgstr "Crear capturas de pantalla para cada intercambio completado"
 #: src/gui/widgets/tabs/setup_players.cpp:143
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
-msgstr "Emular botón derecho del ratón al mantener clic presionado (útil para interfaces táctiles)"
+msgstr ""
+"Emular botón derecho del ratón al mantener clic presionado (útil para "
+"interfaces táctiles)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:148
@@ -5554,13 +5733,17 @@ msgstr "Nada"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "¡Fallo al intercambiar al modo de ventana! ¡La restauración al modo anterior también falló!"
+msgstr ""
+"¡Fallo al intercambiar al modo de ventana! ¡La restauración al modo anterior "
+"también falló!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "¡Fallo al intercambiar al modo de pantalla completa!  ¡La restauración al modo anterior también falló!"
+msgstr ""
+"¡Fallo al intercambiar al modo de pantalla completa!  ¡La restauración al "
+"modo anterior también falló!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5601,7 +5784,8 @@ msgstr "Resolución de pantalla cambiada"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Algunas ventanas pueden ser movidas para adaptarlas a la resolución más baja."
+msgstr ""
+"Algunas ventanas pueden ser movidas para adaptarlas a la resolución más baja."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -5770,70 +5954,70 @@ msgid "Atk"
 msgstr "Atk"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr "Criaturas prioritarias"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr "Criaturas atacadas"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr "Criaturas ignoradas"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr "Amigos: %u/%u"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr "Jugadores: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Jugador %s invitado al gremio %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Gremio %s pidiendo salir."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "Miembro invitado al Gremio."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "¿A quién te gustaría invitar al gremio %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "¿Dejar el gremio?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "¿Estás seguro de dejar el gremio %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr "Miembros: %u/%u"
@@ -5845,41 +6029,41 @@ msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr "Portales: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Jugador %s invitado al grupo."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Renuncia al grupo %s solicitada."
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "Invitación de un miembro al grupo"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "¿A quién te gustaría invitar al grupo %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "¿Dejar grupo?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "¿Estás seguro de que quieres dejar el grupo %s?"
@@ -5891,17 +6075,17 @@ msgid "Pik"
 msgstr "Pik"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr "Recoger Items"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr "Ignorar Items"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr "Jugadores visibles: %d"
@@ -6134,10 +6318,8 @@ msgstr "Cantidad:"
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Crear"
 
@@ -6170,13 +6352,17 @@ msgstr "Escribe el nuevo correo dos veces:"
 #: src/gui/windows/changeemaildialog.cpp:137
 #, c-format
 msgid "The new email address needs to be at least %u characters long."
-msgstr "El nuevo correo electrónico necesita tener al menos %u caracteres de largitud."
+msgstr ""
+"El nuevo correo electrónico necesita tener al menos %u caracteres de "
+"largitud."
 
 #. TRANSLATORS: change email error
 #: src/gui/windows/changeemaildialog.cpp:145
 #, c-format
 msgid "The new email address needs to be less than %u characters long."
-msgstr "El nuevo correo electrónicao necesita tener menos de %u caracteres de longitud."
+msgstr ""
+"El nuevo correo electrónicao necesita tener menos de %u caracteres de "
+"longitud."
 
 #. TRANSLATORS: change email error
 #: src/gui/windows/changeemaildialog.cpp:153
@@ -6254,8 +6440,7 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6273,8 +6458,7 @@ msgstr "Por favor, distribuye %d puntos"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6300,8 +6484,7 @@ msgstr "Apariencia:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr "F"
 
@@ -6400,7 +6583,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "HP: %u/%u\nMp: %u/%u\nNivel: %u\nExperiencia: %u\nDinero: %s"
+msgstr ""
+"HP: %u/%u\n"
+"Mp: %u/%u\n"
+"Nivel: %u\n"
+"Experiencia: %u\n"
+"Dinero: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6466,11 +6654,6 @@ msgid "Yes"
 msgstr "Sí"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr "Objetivo"
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr "Red"
@@ -6502,8 +6685,7 @@ msgstr "Editar Servidor"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Conectar"
 
@@ -6545,7 +6727,8 @@ msgstr "Versión del paquete:"
 #. TRANSLATORS: edit server dialog error message
 #: src/gui/windows/editserverdialog.cpp:206
 msgid "Please at least type both the address and the port of the server."
-msgstr "Por favor, por lo menos especifique el nombre y el puerto del servidor."
+msgstr ""
+"Por favor, por lo menos especifique el nombre y el puerto del servidor."
 
 #. TRANSLATORS: egg selection dialog name
 #: src/gui/windows/eggselectiondialog.cpp:42
@@ -6572,8 +6755,8 @@ msgstr "Fuentes"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -6869,15 +7052,13 @@ msgstr "Asunto:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr "Dinero:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr "Artículo:"
@@ -7104,13 +7285,15 @@ msgstr "Correo:"
 #: src/gui/windows/registerdialog.cpp:188
 #, c-format
 msgid "The username needs to be at least %u characters long."
-msgstr "El nombre de usuario necesita tener al menos %u caracteres de longitud."
+msgstr ""
+"El nombre de usuario necesita tener al menos %u caracteres de longitud."
 
 #. TRANSLATORS: error message
 #: src/gui/windows/registerdialog.cpp:197
 #, c-format
 msgid "The username needs to be less than %u characters long."
-msgstr "El nombre de usuario necesita tener menos de %u caracteres de longitud."
+msgstr ""
+"El nombre de usuario necesita tener menos de %u caracteres de longitud."
 
 #. TRANSLATORS: error message
 #: src/gui/windows/registerdialog.cpp:206
@@ -7279,173 +7462,138 @@ msgid "Up"
 msgstr "Incrementar"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Puntos disponibles: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidades %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidad %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nivel: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Habilidad fallida: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, 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:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr "Texto: "
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "Invitar"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceptada la invitación de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Cancelada la invitación de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceptada la invitación al gremio de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rechazada la invitación al gremio de %s."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Creando gremio llamado %s."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "Creando grupo llamado %s."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "Nombre del Gremio"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "Escoge el nombre de tu gremio."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr "Recibida petición de creación del gremio, pero ya existe uno."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te ha invitado a unirte al gremio %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "Aceptar invitación al gremio"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "Recibida petición de creación del grupo, pero ya existe uno."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "Has sido invitado a unirte un grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Has sido invitado a unirte al grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te ha invitado a unirte a su grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te ha invitado a unirte al grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "Aceptar invitación al grupo"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "No se pudo crear el grupo; ya estás en uno."
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "Nombre del grupo"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "Escoge el nombre de tu grupo."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7585,9 +7733,10 @@ msgstr "No tienes suficiente dinero."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en la ventana."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
+"la ventana."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -7672,25 +7821,25 @@ msgstr "Escoger Mundo"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr "tecla desconocida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7698,7 +7847,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "desc."
 
@@ -8841,7 +8990,9 @@ msgstr "Limpiar ventana de drops"
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr "Acceso denegado. Lo más probable es que hayan muchos jugadores en este servidor."
+msgstr ""
+"Acceso denegado. Lo más probable es que hayan muchos jugadores en este "
+"servidor."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:55
@@ -8909,7 +9060,9 @@ msgstr "No pudo ser enviado el Susurro, ya que es ignorado por %s."
 #. TRANSLATORS: chat message
 #: src/net/ea/chatrecv.cpp:114
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "El susurro no pudo ser enviado. Estás siendo ignorado por todos los jugadores."
+msgstr ""
+"El susurro no pudo ser enviado. Estás siendo ignorado por todos los "
+"jugadores."
 
 #. TRANSLATORS: error header
 #: src/net/ea/gamerecv.cpp:67
@@ -8999,7 +9152,9 @@ msgstr "Rechazado del servidor."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Has sido proscrito permanentemente del juego. Por favor contacta con el equipo de GM."
+msgstr ""
+"Has sido proscrito permanentemente del juego. Por favor contacta con el "
+"equipo de GM."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -9014,7 +9169,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Has sido proscrito temporalmente del juego hasta %s.\nPor favor contacta al equipo de GM a través de los foros."
+msgstr ""
+"Has sido proscrito temporalmente del juego hasta %s.\n"
+"Por favor contacta al equipo de GM a través de los foros."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10101,14 +10258,18 @@ msgstr "Tarjeta insertada."
 msgid ""
 "Deposit failed. You probably don't have this amount of money with you right "
 "now."
-msgstr "Deposito fallido. Probablemente no tengas esta cantidad de dinero contigo en este momento."
+msgstr ""
+"Deposito fallido. Probablemente no tengas esta cantidad de dinero contigo en "
+"este momento."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:427
 msgid ""
 "Withdraw failed. You probably don't have this amount of money in the bank "
 "right now."
-msgstr "Retiro fallido. Probablemente no tengas esta cantidad de dinero en el banco en este momento."
+msgstr ""
+"Retiro fallido. Probablemente no tengas esta cantidad de dinero en el banco "
+"en este momento."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:432
@@ -10150,12 +10311,15 @@ msgstr "El convenio ha fallado."
 msgid ""
 "The trade failed, because the entered amount of item is higher, than the "
 "buyer is willing to buy."
-msgstr "El intercambio falló, porque la cantidad de artículos ingresado es más alto que la que el comprador está dispuesto a comprar."
+msgstr ""
+"El intercambio falló, porque la cantidad de artículos ingresado es más alto "
+"que la que el comprador está dispuesto a comprar."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:465
 msgid "The trade failed, because the buyer is lacking required balance."
-msgstr "El intercambio falló, porque el comprador carece del balance requerido."
+msgstr ""
+"El intercambio falló, porque el comprador carece del balance requerido."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:470
@@ -10175,7 +10339,9 @@ msgstr "No se encontraron almacenes coincidentes."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:483
 msgid "There are too many results. Please enter more detailed search term."
-msgstr "Hay muchos resultados. Por favor, ingresa términos de búsqueda más detallados."
+msgstr ""
+"Hay muchos resultados. Por favor, ingresa términos de búsqueda más "
+"detallados."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:488
@@ -10392,7 +10558,8 @@ msgstr "No puedes agregar el artículo a la tarjeta porque pesa demasiado."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:654
 msgid "You can't add item to card because too many items."
-msgstr "No puedes agregar el artículo a la tarjeta porque hay muchos artículos."
+msgstr ""
+"No puedes agregar el artículo a la tarjeta porque hay muchos artículos."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:658
@@ -10566,7 +10733,8 @@ msgstr "Error al adoptar al niño. Tu nivel es muy bajo."
 #: src/resources/notifications.h:816
 msgid ""
 "Child adoption failed. This player is already married and can't be a baby."
-msgstr "Error al adoptar al niño. Este jugador ya estácasado y no puede ser un bebé."
+msgstr ""
+"Error al adoptar al niño. Este jugador ya estácasado y no puede ser un bebé."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:821
@@ -10584,30 +10752,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr "Error al guardar posición. No tienes la habilidad de teletransporte."
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr "Nvl: %d / %d"
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr "Desconocido:"
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr " / Mana: -%d"
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr "Alcance: %d"
@@ -10618,11 +10786,6 @@ msgid "Ground"
 msgstr "Tierra"
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr "Ego"
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr "No Usado"
@@ -10641,7 +10804,8 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
+msgstr ""
+"Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10697,3 +10861,30 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Falta el nombre del gremio."
+
+#~ msgid "Invite"
+#~ msgstr "Invitar"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "Creando gremio llamado %s."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "Creando grupo llamado %s."
+
+#~ msgid "Guild Name"
+#~ msgstr "Nombre del Gremio"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "Escoge el nombre de tu gremio."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "No se pudo crear el grupo; ya estás en uno."
+
+#~ msgid "Party Name"
+#~ msgstr "Nombre del grupo"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "Escoge el nombre de tu grupo."
diff --git a/po/fi.po b/po/fi.po
index 1c83f24e4..3e9d09093 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Sini Ruohomaa <sini.ruohomaa@iki.fi>, 2011
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/akaras/manaplus/language/"
+"fi/)\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -30,7 +31,6 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -50,10 +50,9 @@ msgstr ""
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -102,80 +101,85 @@ msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
 msgstr ""
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Ryhmän nimi puuttuu."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Luo ryhmä"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Killan nimi puuttuu."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Luo"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Anna nimi."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "Viesti sulkee keskustelun."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "Nyt viesti sulkee keskustelun."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -449,8 +453,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "Jätä täysin huomiotta"
 
@@ -534,8 +538,8 @@ msgstr "Apua"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -692,7 +696,8 @@ msgstr "  -c --character      : Hahmo sisäänkirjautumiseen"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Palvelinnimi tai IP-osoite sisäänkirjautumiseen"
+msgstr ""
+"  -s --server         : Palvelinnimi tai IP-osoite sisäänkirjautumiseen"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:80
@@ -1237,15 +1242,14 @@ msgstr "Viesti"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta."
 
 #. TRANSLATORS: weight message
@@ -1262,8 +1266,7 @@ msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "oletus"
 
@@ -1424,8 +1427,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(oletus)"
 
@@ -1731,8 +1734,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1751,58 +1754,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "Luo ryhmä"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "Peru"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1824,7 +1775,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1838,8 +1789,8 @@ msgstr "Tee kaupat"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "Hyökkää"
@@ -1850,36 +1801,36 @@ msgstr "Hyökkää"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "Kuiskaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "Paranna"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "Potki killasta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 msgid "Change pos in guild"
 msgstr "Muuta kilta-asemaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "Kutsu kiltaan"
 
@@ -1887,7 +1838,7 @@ msgstr "Kutsu kiltaan"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "Pommita"
 
@@ -1904,9 +1855,9 @@ msgstr "Pommita"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "Liiku"
@@ -1915,7 +1866,7 @@ msgstr "Liiku"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Keskustele"
@@ -1930,7 +1881,7 @@ msgstr "Keskustele"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1948,7 +1899,7 @@ msgstr "Osta"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1960,26 +1911,26 @@ msgstr "Myy"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr "Lisää kommentti"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 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:320
+#: src/gui/popups/popupmenu.cpp:321
 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:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "Lisää hyökkäyslistaan"
 
@@ -1987,19 +1938,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:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 msgid "Add to ignore list"
 msgstr "Lisää ohitettavien listaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr ""
 
@@ -2007,7 +1958,7 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr ""
 
@@ -2017,8 +1968,8 @@ msgstr ""
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "Nimeä uudelleen"
@@ -2027,13 +1978,13 @@ msgstr "Nimeä uudelleen"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr ""
 
@@ -2041,7 +1992,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2054,7 +2005,7 @@ msgstr "Poista varuste käytöstä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr ""
 
@@ -2062,39 +2013,88 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "Lisää nimi keskusteluun"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "Peru"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Pelaajat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Potki ryhmästä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "Poimi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Lisää keskusteluun"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "Karttaolio"
 
@@ -2104,28 +2104,28 @@ msgstr "Karttaolio"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "Poista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr "Warppaa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr ""
 
@@ -2134,7 +2134,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2142,69 +2142,68 @@ msgstr "Asukokonaisuudet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr "Poista asu"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Loitsut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 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:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "Tyhjennä"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "Estä korostus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr "Salli korostus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 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:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "Poista nimi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 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:870
+#: src/gui/popups/popupmenu.cpp:887
 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:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "Eroa"
 
@@ -2214,116 +2213,116 @@ msgstr "Eroa"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr "Kopioi leikepöydälle"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "Muuta asemaa killassa"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr "Pelaaja"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 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:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "Nimi:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr "Pelaajakommentti          "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr "Kommentti:                    "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 msgid "Add to trade"
 msgstr "Lisää kauppaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1745
+#: src/gui/popups/popupmenu.cpp:1762
 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:1750
+#: src/gui/popups/popupmenu.cpp:1767
 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:1754
+#: src/gui/popups/popupmenu.cpp:1771
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr "Lisää kaikki kauppaan"
 
@@ -2332,8 +2331,8 @@ msgstr "Lisää kaikki kauppaan"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2341,63 +2340,63 @@ msgstr "Varastoi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "Varastoi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "Varastoi puolet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Varastoi kaikki"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "Ota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "Ota 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 msgid "Retrieve half"
 msgstr "Ota puolet"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Ota kaikki"
 
@@ -2408,17 +2407,17 @@ msgstr "Ota kaikki"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Käytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr ""
 
@@ -2427,43 +2426,43 @@ msgstr ""
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "Piilota"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "Näytä"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 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:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr "Kopioi keskusteluun"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "Siirrä ylös"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr "Siirrä alas"
 
@@ -2471,175 +2470,245 @@ msgstr "Siirrä alas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr "Riisu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "Oletus"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr "Kohde"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Korjaa sijainti automaattisesti"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 msgid "Disregard"
 msgstr "Vaimenna"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 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:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr "Musta lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr "Aseta viholliseksi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr "Pyyhi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "Ystävysty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "Huomioi jälleen"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "Seuraa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "Osta (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "Myy (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "Kutsu ryhmään"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "Näytä tavarat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Pudota..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "Pudota kaikki"
 
@@ -2647,38 +2716,38 @@ msgstr "Pudota kaikki"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Pudota"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr ""
 
@@ -2687,7 +2756,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2696,7 +2765,7 @@ msgstr "Tavarat"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr "Varasto"
 
@@ -2705,7 +2774,7 @@ msgstr "Varasto"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2714,31 +2783,31 @@ msgstr "Kärry"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Komennot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr ""
 
@@ -2746,7 +2815,7 @@ msgstr ""
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr ""
 
@@ -2754,109 +2823,109 @@ msgstr ""
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2864,31 +2933,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr "Potki"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2897,19 +2966,19 @@ msgstr ""
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2921,8 +2990,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2930,63 +2999,82 @@ msgstr "Tietoja"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "Eroa ryhmästä?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr ""
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Korjaa sijainti automaattisesti"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "Ryhmä: %s"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3521,6 +3609,11 @@ msgstr ""
 msgid "Party"
 msgstr "Ryhmä"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Ryhmän nimi puuttuu."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3529,15 +3622,13 @@ msgstr "Saaliinjako käytössä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Saaliinjako poistettu käytöstä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Saaliinjako ei ole mahdollista."
 
@@ -3548,22 +3639,19 @@ msgstr "Saaliinjaon tila on tuntematon."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Kokemuksen jako käytössä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Kokemuksen jako pois käytöstä."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Kokemuksen jako ei ole mahdollista."
 
@@ -4004,15 +4092,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Värit"
 
@@ -4036,9 +4124,11 @@ msgstr "Näytä keskustelun värilista"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4065,9 +4155,11 @@ msgstr "Keskusteluviestin pituusraja"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4078,7 +4170,9 @@ msgstr "Keskusteluvälilehden riviraja"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4119,8 +4213,8 @@ msgstr "Näytä keskusteluhistoria"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4131,9 +4225,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4144,9 +4240,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4162,9 +4260,13 @@ msgstr "Piilota kauppaviestit"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4177,7 +4279,8 @@ msgstr "Näytä MVP-viestit"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4196,9 +4299,12 @@ msgstr "Laita kaikki kuiskaukset välilehtiin"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4209,7 +4315,8 @@ msgstr "Kirjaa magiaviestit debug-välilehdelle"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4222,9 +4329,11 @@ msgstr "Näytä palvelinviestit debug-välilehdellä"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4249,9 +4358,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4262,7 +4373,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4275,7 +4387,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4288,7 +4402,9 @@ msgstr "Ota taisteluvälilehti käyttöön"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4314,7 +4430,10 @@ msgstr "Muuta välilehden kokoa tarpeen mukaan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4349,7 +4468,8 @@ msgstr "Korosta sanat (pilkuin erotettu)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4362,7 +4482,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4375,9 +4496,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4466,11 +4590,6 @@ msgid "Unassign"
 msgstr "Poista asetus"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "Oletus"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr ""
@@ -4491,7 +4610,9 @@ msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; ole hyvä ja poista päällekkäisyydet."
+msgstr ""
+"Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
+"ole hyvä ja poista päällekkäisyydet."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5586,7 +5707,8 @@ msgstr "Ikkunan koko vaihdettu"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
+msgstr ""
+"Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -5755,70 +5877,70 @@ msgid "Atk"
 msgstr "Hyö"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr "Priorisoidut kohteet"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr "Hyökkäyskohteet"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr "Ohitettavat kohteet"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Kutsuit käyttäjän %s kiltaan %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Killasta %s eroa pyydetty."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "Jäsenen kutsuminen kiltaan"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Kenet haluaisit kutsua kiltaan %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "Eroa killasta?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Haluatko varmasti erota killasta %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
@@ -5830,41 +5952,41 @@ msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Käyttäjä %s kutsuttu ryhmään."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Ryhmästä %s eroamista pyydetty."
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "Jäsenen kutsuminen ryhmään"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Kenet haluaisit kutsua ryhmään %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "Eroa ryhmästä?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Haluatko varmasti erota ryhmästä %s?"
@@ -5876,17 +5998,17 @@ msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
@@ -6119,10 +6241,8 @@ msgstr "Määrä:"
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Luo"
 
@@ -6239,8 +6359,7 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6258,8 +6377,7 @@ msgstr "Jaa %d pistettä"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6285,8 +6403,7 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr ""
 
@@ -6451,11 +6568,6 @@ msgid "Yes"
 msgstr "Kyllä"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr "Kohde"
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr "Verkko"
@@ -6487,8 +6599,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Yhdistä"
 
@@ -6557,8 +6668,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr ""
 
@@ -6854,15 +6965,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7264,173 +7373,138 @@ msgid "Up"
 msgstr "Ylös"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, 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:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr "Taitojoukko %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "Taito %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Taso: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "Kutsu"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Otit vastaan kiltakutsun pelaajalta %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Kieltäydyit pelaajan %s kiltakutsusta."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Luon killan %s."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "Luon ryhmän %s."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "Killan nimi"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "Valitse killallesi nimi."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s on kutsunut sinut liittymään kiltaan %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "Ota kiltakutsu vastaan"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "Sinut on kutsuttu liittymään ryhmään."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Sinut on kutsuttu liittymään ryhmään %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s on kutsunut sinut liittymään ryhmäänsä %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "Ota ryhmäkutsu vastaan"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "Ryhmän luominen epäonnistui, olet jo ryhmän jäsen."
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "Ryhmän nimi"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "Anna ryhmällesi nimi."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7570,8 +7644,7 @@ msgstr "Sinulla ei ole tarpeeksi rahaa."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
 
 #. TRANSLATORS: trade error
@@ -7657,25 +7730,25 @@ msgstr "Valitse pelimaailma"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7683,7 +7756,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -8984,7 +9057,8 @@ msgstr "Palvelin ei kelpuuttanut yhteydenottoasi."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Pääsysi peliin on pysyvästi estetty. Ole hyvä ja ota yhteyttä GM-tiimiin."
+msgstr ""
+"Pääsysi peliin on pysyvästi estetty. Ole hyvä ja ota yhteyttä GM-tiimiin."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -8999,7 +9073,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Pääsysi peliin on väliaikaisesti estetty %s asti.\nOle hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta."
+msgstr ""
+"Pääsysi peliin on väliaikaisesti estetty %s asti.\n"
+"Ole hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -9914,7 +9990,8 @@ msgstr ""
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:287
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Tavaran lisääminen epäonnistui; kauppakumppanilla on liian painava lasti."
+msgstr ""
+"Tavaran lisääminen epäonnistui; kauppakumppanilla on liian painava lasti."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:291
@@ -10569,30 +10646,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr ""
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -10603,11 +10680,6 @@ msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr ""
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr ""
@@ -10626,7 +10698,9 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti \"true\", \"false\", \"1\" tai \"0\"."
+msgstr ""
+"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
+"\"true\", \"false\", \"1\" tai \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10682,3 +10756,30 @@ msgstr "%d sekuntia"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekuntia"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Killan nimi puuttuu."
+
+#~ msgid "Invite"
+#~ msgstr "Kutsu"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "Luon killan %s."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "Luon ryhmän %s."
+
+#~ msgid "Guild Name"
+#~ msgstr "Killan nimi"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "Valitse killallesi nimi."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "Ryhmän luominen epäonnistui, olet jo ryhmän jäsen."
+
+#~ msgid "Party Name"
+#~ msgstr "Ryhmän nimi"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "Anna ryhmällesi nimi."
diff --git a/po/fr.po b/po/fr.po
index 73800bf9b..e24b35fce 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # adrien vigneron <adrienvigneron@ml1.net>, 2016
 # Alige, 2013-2016
@@ -27,14 +27,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
-"PO-Revision-Date: 2016-08-15 23:26+0000\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
+"PO-Revision-Date: 2016-08-18 19:55+0000\n"
 "Last-Translator: Alige\n"
-"Language-Team: French (http://www.transifex.com/akaras/manaplus/language/fr/)\n"
+"Language-Team: French (http://www.transifex.com/akaras/manaplus/language/"
+"fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -48,7 +49,6 @@ msgstr "Fichier mis en ligne"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -68,10 +68,9 @@ msgstr "Fichier mis en ligne"
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -120,80 +119,90 @@ msgid "Uploaded log into:"
 msgstr "Historique ajouté dans:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
-msgstr "Dernière fois vu désactivé. Activer dans joueurs / collecter les id des joueurs et l'historique de vue."
+msgstr ""
+"Dernière fois vu désactivé. Activer dans joueurs / collecter les id des "
+"joueurs et l'historique de vue."
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr "Tu n'as pas vu ce ce pseudo."
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr "Dernière fois vu pour %s: %s"
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr "Impossible d'envoyer un message privé vide ou un message de chaîne !"
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr "Impossible de créer un onglet de discussion privée \"%s\". Il existe probablement déjà."
+msgstr ""
+"Impossible de créer un onglet de discussion privée \"%s\". Il existe "
+"probablement déjà."
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Le nom du groupe est manquant."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Créer un groupe"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Le nom de la guilde est manquant."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Dissoudre la guilde"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Indiques un nom."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "La touche <Entrée> ferme la ligne d'entrée de la conversation."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "Le message ferme la conversation."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
-msgstr "La touche <Entrée> ferme maintenant la ligne d'entrée de la conversation."
+msgstr ""
+"La touche <Entrée> ferme maintenant la ligne d'entrée de la conversation."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "Le message ferme maintenant la conversation."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr "pas de chapeau équippé."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr "chapeau équipé %s."
@@ -467,8 +476,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "Ignorer complètement"
 
@@ -552,8 +561,8 @@ msgstr "Aide"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -675,7 +684,8 @@ msgstr "  -l --log-file       : fichier journal à utiliser"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:59
 msgid "  -a --chat-log-dir   : Chat log dir to use"
-msgstr "  -a --chat-log-dir   : Répertoire de l'historique de conversation à utiliser"
+msgstr ""
+"  -a --chat-log-dir   : Répertoire de l'historique de conversation à utiliser"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:61
@@ -730,12 +740,15 @@ msgstr "  -H --update-host    : Utilise cet hôte de mise à jour"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Choisir le serveur de personnages et le personnage par défaut"
+msgstr ""
+"  -D --default        : Choisir le serveur de personnages et le personnage "
+"par défaut"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:93
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Ne pas effectuer le téléchargement des mises à jour"
+msgstr ""
+"  -u --skip-update    : Ne pas effectuer le téléchargement des mises à jour"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:96
@@ -745,7 +758,8 @@ msgstr "  -d --data           : Répertoire des données du jeu à charger"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Répertoire à utiliser comme répertoire principal"
+msgstr ""
+"  -L --localdata-dir  : Répertoire à utiliser comme répertoire principal"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:103
@@ -765,7 +779,9 @@ msgstr "     --renderer       : Définir le type de rendu"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --tests          : Commencer le test des drivers et la configuration automatique"
+msgstr ""
+"  -T --tests          : Commencer le test des drivers et la configuration "
+"automatique"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -793,7 +809,8 @@ msgstr "Impossible de créer le dossier de mises à jour !"
 #: src/dirs.cpp:537 src/dirs.cpp:558
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
-msgstr "Erreur: %s n'existe pas et ne peut pas être créé ! Fermeture du programme."
+msgstr ""
+"Erreur: %s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
 #. TRANSLATORS: directory creation error
 #: src/dirs.cpp:589 src/dirs.cpp:597 src/dirs.cpp:605
@@ -844,7 +861,8 @@ msgstr "La capture d'écran a échoué !"
 #. TRANSLATORS: error message text
 #: src/game.cpp:685
 msgid "The connection to the server was lost."
-msgstr "La connexion au serveur a été coupée, le programme va maintenant se fermer."
+msgstr ""
+"La connexion au serveur a été coupée, le programme va maintenant se fermer."
 
 #. TRANSLATORS: error message header
 #: src/game.cpp:688
@@ -1255,21 +1273,24 @@ msgstr "Message"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr "Ressusciter"
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Tu portes plus de la moitié du poids maximal de ton inventaire. Tu n'es plus en mesure de récupérer ta santé."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Tu portes plus de la moitié du poids maximal de ton inventaire. Tu n'es plus "
+"en mesure de récupérer ta santé."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Tu portes moins de la moitié du poids maximal de ton inventaire. Tu peux maintenant récupérer ta santé."
+msgstr ""
+"Tu portes moins de la moitié du poids maximal de ton inventaire. Tu peux "
+"maintenant récupérer ta santé."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1280,8 +1301,7 @@ msgstr "Tu portes moins de la moitié du poids maximal de ton inventaire. Tu peu
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "défaut"
 
@@ -1442,8 +1462,8 @@ msgstr "Énorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(défaut)"
 
@@ -1749,8 +1769,8 @@ msgstr "Salon de discussion: %s"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1769,58 +1789,6 @@ msgstr "Pv : %d/%d"
 msgid "Particles: %u"
 msgstr "Particules : %u"
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "Créer un groupe"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "Annuler"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1842,7 +1810,7 @@ msgstr "Cartes: "
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1856,8 +1824,8 @@ msgstr "Échange"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "Attaque"
@@ -1868,36 +1836,36 @@ msgstr "Attaque"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "Message privé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "Soigner"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "Éjecter de la guilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 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:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "Inviter dans la guilde"
 
@@ -1905,7 +1873,7 @@ msgstr "Inviter dans la guilde"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "Annihiler"
 
@@ -1922,9 +1890,9 @@ msgstr "Annihiler"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "Déplacement"
@@ -1933,7 +1901,7 @@ msgstr "Déplacement"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Parler"
@@ -1948,7 +1916,7 @@ msgstr "Parler"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1966,7 +1934,7 @@ msgstr "Acheter"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1978,26 +1946,26 @@ msgstr "Vendre"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr "Ajouter commentaire"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 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:320
+#: src/gui/popups/popupmenu.cpp:321
 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:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "Ajouter à la liste d'attaque"
 
@@ -2005,19 +1973,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:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 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:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr "Aller jusqu'au maître"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr "Feu"
 
@@ -2025,7 +1993,7 @@ msgstr "Feu"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr "Nourrir"
 
@@ -2035,8 +2003,8 @@ msgstr "Nourrir"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "Renommer"
@@ -2045,13 +2013,13 @@ msgstr "Renommer"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr "Tuer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr "Abandonne le butin"
 
@@ -2059,7 +2027,7 @@ msgstr "Abandonne le butin"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2072,7 +2040,7 @@ msgstr "Retirer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr "Retourner à l'œuf"
 
@@ -2080,39 +2048,88 @@ 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:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "Ajouter le nom dans la conversation"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "Annuler"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Joueurs"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Éjecter du groupe"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "Ramasser"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "Objet de carte"
 
@@ -2122,28 +2139,28 @@ msgstr "Objet de carte"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "Enlever"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr "Téléportation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr "Bouger la caméra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr "Restorer la caméra"
 
@@ -2152,7 +2169,7 @@ msgstr "Restorer la caméra"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2160,69 +2177,68 @@ msgstr "Costumes"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr "Effacer la tenue"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Sortilèges"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 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:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "Effacer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "Désactiver la surbrillance"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 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:852
+#: src/gui/popups/popupmenu.cpp:869
 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:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "Enlève le nom"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "Active la fonction Absence"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 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:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "Quitter"
 
@@ -2232,116 +2248,116 @@ msgstr "Quitter"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr "Copier vers le presse-papier"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "Changer de position dans la guilde"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr "fenêtre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr "Déverouiller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr "Verouiller"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr "Afficher les émoticônes pour:"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr "Joueur"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr "Familier"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr "Homoncule"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr "Mercenaire"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 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:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "Nom:                     "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr "Le joueur commente        "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr "Commentaire:                  "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 msgid "Add to trade"
 msgstr "Ajouter à la transaction"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1745
+#: src/gui/popups/popupmenu.cpp:1762
 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:1750
+#: src/gui/popups/popupmenu.cpp:1767
 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:1754
+#: src/gui/popups/popupmenu.cpp:1771
 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:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr "Ajouter tout dans l'échange"
 
@@ -2350,8 +2366,8 @@ msgstr "Ajouter tout dans l'échange"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2359,63 +2375,63 @@ msgstr "Entreposer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "Entreposer 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "Entreposer la moitié"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr "Tout entreposer-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Entreposer tout"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr "Passer à l'artisanat..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "Récupérer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "Reprendre 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 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:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr "Tout retirer-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Reprendre tout"
 
@@ -2426,17 +2442,17 @@ msgstr "Reprendre tout"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Utiliser"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr "Vider la fenêtre d'abandon"
 
@@ -2445,43 +2461,43 @@ msgstr "Vider la fenêtre d'abandon"
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "Cacher"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "Montrer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 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:2113
+#: src/gui/popups/popupmenu.cpp:2130
 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:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr "Copier dans la conversation"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "Aller vers le haut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr "Aller vers le bas"
 
@@ -2489,175 +2505,247 @@ msgstr "Aller vers le bas"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr "Déshabiller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr "Copier"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr "Coller"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr "Ouvrir lien"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr "Afficher la fenêtre"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr "Compétence"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+#, fuzzy
+msgid "Skill level..."
+msgstr "Déterminer le niveau de compétence"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+#, fuzzy
+msgid "Select skill level"
 msgstr "Déterminer le niveau de compétence"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr "Niveau maximum"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "Par défaut"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr "Cible"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Auto-correction de position"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr "Soi"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 msgid "Disregard"
 msgstr "Éviter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 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:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr "Liste noire"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr "Définir comme ennemi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr "Éliminer"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "Être ami"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "Ne plus ignorer"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "Suivre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr "Imiter"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "Acheter (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "Vendre (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "Inviter dans le groupe"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr "Rejoindre la conversation %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "Montrer les objets"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 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:2717
+#: src/gui/popups/popupmenu.cpp:2833
 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:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr "Objet non protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr "Objet protégé"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Abandonner..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "Abandonner tout..."
 
@@ -2665,38 +2753,38 @@ msgstr "Abandonner tout..."
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Abandonner"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr "MJ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr "Montrer %s"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr "Informations du compte"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr "Niveau"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr "Statistiques"
 
@@ -2705,7 +2793,7 @@ msgstr "Statistiques"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2714,7 +2802,7 @@ msgstr "Inventaire"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr "Entrepôt"
 
@@ -2723,7 +2811,7 @@ msgstr "Entrepôt"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2732,31 +2820,31 @@ msgstr "Panier"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Commandes"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr "Commandes du personnage"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr "Retour"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr "Localiser"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr "Vérifier ip"
 
@@ -2764,7 +2852,7 @@ msgstr "Vérifier ip"
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr "Aller à"
 
@@ -2772,109 +2860,109 @@ msgstr "Aller à"
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr "Rappeler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr "Rapeler le groupe"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr "Rapeler la guilde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr "Donner le chef du groupe"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr "Montrer..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr "Bâillonner..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr "Immortel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr "Prison"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr "Sorti de prison"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr "Tueur"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr "Victime"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr "Choisir la sauvegarde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr "Téléporter vers la sauvegarde"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr "Téléporter aléatoirement"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr "Faire apparaître un clone"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr "Faire apparaître un clone esclave"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr "Faire apparaître un clone maléfique"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr "Dissoudre la guilde"
 
@@ -2882,31 +2970,31 @@ msgstr "Dissoudre la guilde"
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr "Virer"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr "Bâillonner %s"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr "Mettre en silence %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr "Redonner la parole à %d"
@@ -2915,19 +3003,19 @@ msgstr "Redonner la parole à %d"
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr "Se déguiser"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr "Faire apparaître le même"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr "Faire apparaître un esclave"
 
@@ -2939,8 +3027,8 @@ msgstr "Faire apparaître un esclave"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2948,63 +3036,82 @@ msgstr "Informations"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr "Rechercher"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr "Rechercher des points d’apparitions"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr "Qui abandonne"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr "Commandes de MJ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr "Passer à l'artisanat %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr "Mail à..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr "Apprivoisement du familier"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr "Adopter un enfant"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "Quitter le groupe ?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr "Niveau: %d / %d"
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr "Niveau: Inconnu"
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Auto-correction de position"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "Type: %s"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3227,7 +3334,7 @@ msgstr "Bar des PV de l'élémentaire"
 #. TRANSLATORS: palette color
 #: src/gui/userpalette.cpp:318
 msgid "Elemental HP bar (second color)"
-msgstr "Bar des PV de l'élémentaire (deuxième couleur) "
+msgstr "Bar des PV de l'élémentaire (deuxième couleur)"
 
 #. TRANSLATORS: palette label
 #: src/gui/userpalette.cpp:322
@@ -3539,6 +3646,11 @@ msgstr "Lang"
 msgid "Party"
 msgstr "Groupe"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Le nom du groupe est manquant."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3547,15 +3659,13 @@ msgstr "Partage d'objet activé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Partage d'objet désactivé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Partage d'objet impossible."
 
@@ -3566,22 +3676,19 @@ msgstr "Paramètre de partage d'objets inconnu."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Partage d'expérience autorisé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Partage d'expérience non autorisé."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Partage d'expérience impossible."
 
@@ -4010,7 +4117,10 @@ msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
 "Hit Enter or hover mouse to show chat again."
-msgstr "La fenêtre de conversation sera automatiquement cachée quand inutilisée.\n\nAppuie sur Entrée ou passe la souris sur la conversation pour l'afficher."
+msgstr ""
+"La fenêtre de conversation sera automatiquement cachée quand inutilisée.\n"
+"\n"
+"Appuie sur Entrée ou passe la souris sur la conversation pour l'afficher."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4022,15 +4132,20 @@ msgstr "Protéger la concentration de la conversation"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
-msgstr "Active la protection aggressive de la saisie concentrée dans la fenêtre de conversation.\n\nNote: aucune autre saisie de texte sera acceptée pour recevoir des saisies de texte lorsque tu écris dans la fenêtre de conversation."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
+msgstr ""
+"Active la protection aggressive de la saisie concentrée dans la fenêtre de "
+"conversation.\n"
+"\n"
+"Note: aucune autre saisie de texte sera acceptée pour recevoir des saisies "
+"de texte lorsque tu écris dans la fenêtre de conversation."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Couleurs"
 
@@ -4044,7 +4159,10 @@ msgstr "Retirer les couleurs des messages des conversations"
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
-msgstr "Active cette option afin d'enlever les couleurs des messages de conversation entrants. Tous les messages utiliseront la couleur de conversation par défaut si ceci est activé."
+msgstr ""
+"Active cette option afin d'enlever les couleurs des messages de conversation "
+"entrants. Tous les messages utiliseront la couleur de conversation par "
+"défaut si ceci est activé."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:77
@@ -4054,21 +4172,34 @@ msgstr "Afficher la liste des couleurs de conversation"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
+"\n"
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
+msgstr ""
+"Activer cette option pour afficher le menu déroulant de sélection de "
+"couleurs de dans la fenêtre de conversation. La fenêtre de conversation "
+"affichera le menu déroulant de sélection de couleurs.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
-msgstr "Activer cette option pour afficher le menu déroulant de sélection de couleurs de dans la fenêtre de conversation. La fenêtre de conversation affichera le menu déroulant de sélection de couleurs.\n\nCeci permet de sélectionner la couleur par défaut des messages de conversation émis, aisément, mais cela occupe de la place dans la fenêtre de conversation."
+"Ceci permet de sélectionner la couleur par défaut des messages de "
+"conversation émis, aisément, mais cela occupe de la place dans la fenêtre de "
+"conversation."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
-msgstr "Autoriser les messages de magie et commandes des MJ dans tous les onglets de conversation"
+msgstr ""
+"Autoriser les messages de magie et commandes des MJ dans tous les onglets de "
+"conversation"
 
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
-msgstr "Activer ce paramètre pour être autoriser à écrire Sorts et commande MJ dans tous les onglets."
+msgstr ""
+"Activer ce paramètre pour être autoriser à écrire Sorts et commande MJ dans "
+"tous les onglets."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:98
@@ -4083,10 +4214,17 @@ msgstr "Limiter le nombre max de car de la ligne de conversation"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
-msgstr "Limite le nombre de caractères qui vont être affichés dans les plus grandes lignes de texte affichées dans la conversation.\n\nNote: les longues lignes peuvent ralentir le client. Les lignes plus longues que cette limite seront tronquées."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
+msgstr ""
+"Limite le nombre de caractères qui vont être affichés dans les plus grandes "
+"lignes de texte affichées dans la conversation.\n"
+"\n"
+"Note: les longues lignes peuvent ralentir le client. Les lignes plus longues "
+"que cette limite seront tronquées."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:110
@@ -4096,10 +4234,19 @@ msgstr "Limiter le nombre max de lignes dans les conversations"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
-msgstr "Limite le nombre de lignes de conversation dans l'espace à remonter. La conversation garde un nombre spécifique de dernières lignes de texte. Les plus vieilles lignes qui exéderont cette limite seront supprimées de cette espace à remonter.\n\nNote: garde trop de lignes dans cet espace à remonter peut ralentir le client."
+msgstr ""
+"Limite le nombre de lignes de conversation dans l'espace à remonter. La "
+"conversation garde un nombre spécifique de dernières lignes de texte. Les "
+"plus vieilles lignes qui exéderont cette limite seront supprimées de cette "
+"espace à remonter.\n"
+"\n"
+"Note: garde trop de lignes dans cet espace à remonter peut ralentir le "
+"client."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:120
@@ -4117,7 +4264,12 @@ msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
 "Note: chat logs can take noticeable amount of disk space over time."
-msgstr "Si tu actives cette option, les historiques de conversation seront sauvegardés sur le disque.\n\nNote: les historiques de conversation peuvent prendre un espace considérable sur le disque avec le temps."
+msgstr ""
+"Si tu actives cette option, les historiques de conversation seront "
+"sauvegardés sur le disque.\n"
+"\n"
+"Note: les historiques de conversation peuvent prendre un espace considérable "
+"sur le disque avec le temps."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:131
@@ -4127,7 +4279,9 @@ msgstr "Activer le débogage de l'historique des conversations"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:133
 msgid "If you enable this, debug chat tab also will be logged to disk."
-msgstr "Si tu actives ceci, l'historique de l'onglet de conversation de débogage sera aussi sauvegardé sur le disque."
+msgstr ""
+"Si tu actives ceci, l'historique de l'onglet de conversation de débogage "
+"sera aussi sauvegardé sur le disque."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:137
@@ -4137,9 +4291,12 @@ msgstr "Afficher l'historique de conversation"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
-msgstr "Si cette option est activée, le client chargera les anciens onglets de conversation ainsi que leur contenu depuis l'historique au lancement, au lieu de se lancer avec des onglets vides."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
+msgstr ""
+"Si cette option est activée, le client chargera les anciens onglets de "
+"conversation ainsi que leur contenu depuis l'historique au lancement, au "
+"lieu de se lancer avec des onglets vides."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:144
@@ -4149,10 +4306,17 @@ msgstr "Afficher les messages de connexion du groupe"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
-msgstr "Si cette option est activée, le statut en ligne des membres du groupe changera et sera affiché dans l'onglet de conversation de groupe.\n\nCeci ajoute des sons supplémentaires à la conversation, mais permet de voir lorsque vos amis viennent en ligne."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
+msgstr ""
+"Si cette option est activée, le statut en ligne des membres du groupe "
+"changera et sera affiché dans l'onglet de conversation de groupe.\n"
+"\n"
+"Ceci ajoute des sons supplémentaires à la conversation, mais permet de voir "
+"lorsque vos amis viennent en ligne."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:152
@@ -4162,10 +4326,17 @@ msgstr "Afficher les messages en ligne de la guilde"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
+"\n"
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
+msgstr ""
+"Si cette option est activée, le statut en ligne des membres de la guilde "
+"changera et sera affiché dans l'onglet de conversation de la guilde.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
-msgstr "Si cette option est activée, le statut en ligne des membres de la guilde changera et sera affiché dans l'onglet de conversation de la guilde.\n\nCeci ajoute des sons supplémentaires à la conversation, mais permet de voir lorsque vos amis viennent en ligne."
+"Ceci ajoute des sons supplémentaires à la conversation, mais permet de voir "
+"lorsque vos amis viennent en ligne."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:161
@@ -4180,10 +4351,22 @@ msgstr "Masquer les messages liés à la boutique"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
-msgstr "Si cette option est activée, aucun message en relation avec la boutique intégrée à ManaPlus sera affiché dans la conversation. Désactive cette option si tu veux voir ces messages en relation avec ta boutique.\n\nNote: techniquement, la boutique de ManaPlus implémente d'habitude des messages privés avec un contenu spécial. Si tu désactive cette option, tu auras la possibilité de voir ces messages et avoir une idée de quand les autres joueurs jettent un œil à ta boutique."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
+msgstr ""
+"Si cette option est activée, aucun message en relation avec la boutique "
+"intégrée à ManaPlus sera affiché dans la conversation. Désactive cette "
+"option si tu veux voir ces messages en relation avec ta boutique.\n"
+"\n"
+"Note: techniquement, la boutique de ManaPlus implémente d'habitude des "
+"messages privés avec un contenu spécial. Si tu désactive cette option, tu "
+"auras la possibilité de voir ces messages et avoir une idée de quand les "
+"autres joueurs jettent un œil à ta boutique."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:175
@@ -4195,8 +4378,13 @@ msgstr "Montrer les messages MVP"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
-msgstr "Activer cette option pour voir les messages MVP du seveur.\n\nNote: Les messages MVP se sont pas utilisés sur TMW / Evol / autres serveurs, cette fonction fait alors très peu de différences."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
+msgstr ""
+"Activer cette option pour voir les messages MVP du seveur.\n"
+"\n"
+"Note: Les messages MVP se sont pas utilisés sur TMW / Evol / autres "
+"serveurs, cette fonction fait alors très peu de différences."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
@@ -4214,10 +4402,19 @@ msgstr "Placer tous les messages privés dans des onglets"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
-msgstr "Si cette option est activée, tous les messages privés seront placés dans des onglets séparés pour chaque joueur. Si cette option est activée, tous les messages privés seront placés dans l'onglet Général.\n\nNote: placer tous les messages privés dans un seul onglet est connu pour être troublant. Penses-y à deux fois avant de désactiver cette fonction."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
+msgstr ""
+"Si cette option est activée, tous les messages privés seront placés dans des "
+"onglets séparés pour chaque joueur. Si cette option est activée, tous les "
+"messages privés seront placés dans l'onglet Général.\n"
+"\n"
+"Note: placer tous les messages privés dans un seul onglet est connu pour "
+"être troublant. Penses-y à deux fois avant de désactiver cette fonction."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:197
@@ -4227,10 +4424,15 @@ msgstr "Effectuer l'historique des messages de magie dans l'onglet de débogage"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
-msgstr "Si cette option est activée, les messages de sorts seront montrés dans Debug. Si elle est désactivée, ils apparaîtront dans l'onglet Général.\n\nNote: cela n'affecte pas les réponses du serveur en lien avec les sorts."
+msgstr ""
+"Si cette option est activée, les messages de sorts seront montrés dans "
+"Debug. Si elle est désactivée, ils apparaîtront dans l'onglet Général.\n"
+"\n"
+"Note: cela n'affecte pas les réponses du serveur en lien avec les sorts."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:205
@@ -4240,10 +4442,18 @@ msgstr "Afficher les messages du serveur dans l'onglet de débogage"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
+"\n"
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
+msgstr ""
+"Si cette option est activée, les messages du serveur seront montrés dans "
+"l'onglet Debug. Si elle est désactivée, ils apparaîtront dans l'onglet "
+"Général.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
-msgstr "Si cette option est activée, les messages du serveur seront montrés dans l'onglet Debug. Si elle est désactivée, ils apparaîtront dans l'onglet Général.\n\nNote: selon 4144, désactiver ceci ferait disparaître certains messages du serveur, puisque ceux-ci sont de faux messages."
+"Note: selon 4144, désactiver ceci ferait disparaître certains messages du "
+"serveur, puisque ceux-ci sont de faux messages."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:215
@@ -4257,7 +4467,13 @@ msgid ""
 "words typical for trades will go to Trade tab. This will make General tab "
 "less noisy. If this setting is disabled, all trade related players messages "
 "will stay in General tab."
-msgstr "Active l'onglet des échanges. L'onglet d'échange est en quelques sortes un filtre. Les messages contenants certains mots typiques des échanges iront directement dans l'onglet des échanges. Ceci fera en sorte que l'onglet Général sera moins bruyant. Si cette option est désactivée, tous les échanges en relation avec les messages des joueurs resteront dans l'onglet Général."
+msgstr ""
+"Active l'onglet des échanges. L'onglet d'échange est en quelques sortes un "
+"filtre. Les messages contenants certains mots typiques des échanges iront "
+"directement dans l'onglet des échanges. Ceci fera en sorte que l'onglet "
+"Général sera moins bruyant. Si cette option est désactivée, tous les "
+"échanges en relation avec les messages des joueurs resteront dans l'onglet "
+"Général."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:224
@@ -4267,10 +4483,17 @@ msgstr "Activer l'onglet de MJ"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
-msgstr "Si ceci est activé, l'onglet MJ apparaître dans la conversation. Ceci affichera le text en relation avec l'activité des MJ.\n\nNote: cette option fait de la différence seulement pour les MJ (Maîtres Joueurs) puisque cet onglet ne s'affichera que pour eux."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
+msgstr ""
+"Si ceci est activé, l'onglet MJ apparaître dans la conversation. Ceci "
+"affichera le text en relation avec l'activité des MJ.\n"
+"\n"
+"Note: cette option fait de la différence seulement pour les MJ (Maîtres "
+"Joueurs) puisque cet onglet ne s'affichera que pour eux."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:232
@@ -4280,10 +4503,15 @@ msgstr "Activer l'onglet des langues"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
-msgstr "Si cette fonction est activée, l'onglet des langues apparaîtra si le serveur le permet.\n\nNote: Seulement permis par le serveur d'Evol pour l'instant."
+msgstr ""
+"Si cette fonction est activée, l'onglet des langues apparaîtra si le serveur "
+"le permet.\n"
+"\n"
+"Note: Seulement permis par le serveur d'Evol pour l'instant."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:240
@@ -4293,10 +4521,18 @@ msgstr "Afficher tous les messages de langue"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
-msgstr "Si cette option est activée et que le serveur permet différentes conversations pour différentes langues, tu verras les messages de toutes les langues, peu importe tes préférences de langues.\n\nNote: cela fonctionne seulement sur les serveur permettant cette fonction d'onglets de langue, comme Evol."
+msgstr ""
+"Si cette option est activée et que le serveur permet différentes "
+"conversations pour différentes langues, tu verras les messages de toutes les "
+"langues, peu importe tes préférences de langues.\n"
+"\n"
+"Note: cela fonctionne seulement sur les serveur permettant cette fonction "
+"d'onglets de langue, comme Evol."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:250
@@ -4306,10 +4542,18 @@ msgstr "Activer l'onglet de combat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
-msgstr "Si cette option est activée, l'onglet des Combats sera affiché dans la conversation. Cet onglet contriendra certains messages relatifs aux combats, comme les dégâts et les gains d'expérience, si les messages de combats sont activés.\n\nNote: le redémarrage du client est nécessaire pour prendre effet."
+msgstr ""
+"Si cette option est activée, l'onglet des Combats sera affiché dans la "
+"conversation. Cet onglet contriendra certains messages relatifs aux combats, "
+"comme les dégâts et les gains d'expérience, si les messages de combats sont "
+"activés.\n"
+"\n"
+"Note: le redémarrage du client est nécessaire pour prendre effet."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:259
@@ -4322,7 +4566,10 @@ msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
 "battle messages will be displayed."
-msgstr "Si cette option est activée, les messages relatifs aux combats tel que les dégâts ou le gain d'expérience sera affiché dans l'onglet de Débogage ou l'onglet de Combat. Si désactivé, aucun message de combat ne sera affiché."
+msgstr ""
+"Si cette option est activée, les messages relatifs aux combats tel que les "
+"dégâts ou le gain d'expérience sera affiché dans l'onglet de Débogage ou "
+"l'onglet de Combat. Si désactivé, aucun message de combat ne sera affiché."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:267
@@ -4332,10 +4579,21 @@ msgstr "Si besoin est, changer la taille des onglets de conversation"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
-msgstr "Si cette fonction est activée, le texte dans la conversation sera automatique ajusté pour s'adapter aux apparences de champs de saisie de conversation lorsque tu écriras un message et lorsque le champ de saisie de conversation disparaîtra. Si désactivé, la zone d'entrée de conversation occupera toujours sa place, ce qui cependant utilisable pour du texte.\n\nNote: c'est principalement à propos d'attitudes nerveuses contre moins d'espace utilisable pour du texte."
+msgstr ""
+"Si cette fonction est activée, le texte dans la conversation sera "
+"automatique ajusté pour s'adapter aux apparences de champs de saisie de "
+"conversation lorsque tu écriras un message et lorsque le champ de saisie de "
+"conversation disparaîtra. Si désactivé, la zone d'entrée de conversation "
+"occupera toujours sa place, ce qui cependant utilisable pour du texte.\n"
+"\n"
+"Note: c'est principalement à propos d'attitudes nerveuses contre moins "
+"d'espace utilisable pour du texte."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:279
@@ -4357,7 +4615,10 @@ msgstr "Utiliser l’horaire local"
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
-msgstr "Si cette fonction est activée, l'horodatage de la conversation utilisera l'heure locale. Si désactivée, l'heure du server sera utilisée (souvent, c'est du GMT+0)."
+msgstr ""
+"Si cette fonction est activée, l'horodatage de la conversation utilisera "
+"l'heure locale. Si désactivée, l'heure du server sera utilisée (souvent, "
+"c'est du GMT+0)."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:297
@@ -4367,10 +4628,15 @@ msgstr "Mots en surbrillance (séparés par une virgule)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
-msgstr "Ici tu peux spécifier sertains mots supplémentaires qui produira un surlignage. Utilise des virgules pour séparer les mots.\n\nNote: les surlignages fréquents sont agaçants - utiliser avec prudence."
+msgstr ""
+"Ici tu peux spécifier sertains mots supplémentaires qui produira un "
+"surlignage. Utilise des virgules pour séparer les mots.\n"
+"\n"
+"Note: les surlignages fréquents sont agaçants - utiliser avec prudence."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:305
@@ -4380,10 +4646,18 @@ msgstr "Ignorer de multiples noms (séparés par une virgule)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
-msgstr "Cette option te permet d'ignorer certains messages globaux si l'envoyeur est particulier (PNJ, MJ) et t'agacent trop. Les messages globaux seront alors bougés\nà l'onglet de Débogage.\n\nNote: Fais attention lorsque tu utilises cette fonction, tu risques de rater des annonces importantes !"
+msgstr ""
+"Cette option te permet d'ignorer certains messages globaux si l'envoyeur est "
+"particulier (PNJ, MJ) et t'agacent trop. Les messages globaux seront alors "
+"bougés\n"
+"à l'onglet de Débogage.\n"
+"\n"
+"Note: Fais attention lorsque tu utilises cette fonction, tu risques de rater "
+"des annonces importantes !"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:314
@@ -4393,10 +4667,19 @@ msgstr "Afficher le bouton des émoticônes dans la conversation"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
-msgstr "Si cette option est activée, un bouton apparaîtra près du champ de saisie de texte. Ce bouton permet d'invoquer la composition de fenêtres, qui permet d'insérer des sourrires et du formatage de texte facilement.\n\nNote: la même fenêtre peut aussi être invoquée par une touche de raccourci en écrivant, souvent F1 par défault."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
+msgstr ""
+"Si cette option est activée, un bouton apparaîtra près du champ de saisie de "
+"texte. Ce bouton permet d'invoquer la composition de fenêtres, qui permet "
+"d'insérer des sourrires et du formatage de texte facilement.\n"
+"\n"
+"Note: la même fenêtre peut aussi être invoquée par une touche de raccourci "
+"en écrivant, souvent F1 par défault."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:324
@@ -4408,7 +4691,10 @@ msgstr "Afficher le message du serveur motd au démarrage"
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
-msgstr "Si cette option est activée, le client affichera le MDJ (message du jour) du server une fois que tu te connecteras au serveur. Désactiver pour ne pas afficher ce MDJ."
+msgstr ""
+"Si cette option est activée, le client affichera le MDJ (message du jour) du "
+"server une fois que tu te connecteras au serveur. Désactiver pour ne pas "
+"afficher ce MDJ."
 
 #. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
@@ -4484,11 +4770,6 @@ msgid "Unassign"
 msgstr "Désassigner"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "Par défaut"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Réinitialiser toutes les touches"
@@ -4509,7 +4790,9 @@ msgstr "Conflit(s) de touche détecté(s)."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Conflit entre les touches \"%s\" and \"%s\". Changes au moins l'une de celles-ci ou bien attends-toi à un possible comportement étrange du jeu."
+msgstr ""
+"Conflit entre les touches \"%s\" and \"%s\". Changes au moins l'une de "
+"celles-ci ou bien attends-toi à un possible comportement étrange du jeu."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -4894,7 +5177,8 @@ msgstr "Support des bots"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Enable guild bot support and disable native guild support"
-msgstr "Activer le support du bot de guilde et désactiver le support par défault"
+msgstr ""
+"Activer le support du bot de guilde et désactiver le support par défault"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:313
@@ -5057,7 +5341,8 @@ msgstr "Accélération matérielle"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 msgid "Enable opacity cache (Software, can use much memory)"
-msgstr "Activer le cache d'opacité (Logiciel, peut utiliser beaucoup de mémoire)"
+msgstr ""
+"Activer le cache d'opacité (Logiciel, peut utiliser beaucoup de mémoire)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:79
@@ -5087,7 +5372,8 @@ msgstr "Meilleure qualité (désactiver pour une meilleure performance)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:101
 msgid "Enable alpha channel fix (Software, can be very slow)"
-msgstr "Autoriser les correction des champs alpha ( Programme, cela peut être lent)"
+msgstr ""
+"Autoriser les correction des champs alpha ( Programme, cela peut être lent)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:106
@@ -5117,7 +5403,8 @@ msgstr "Désactiver la mise en cache des créatures"
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:129
 msgid "Different options (enable or disable can improve performance)"
-msgstr "Différentes options (activer ou désactiver peut améliorer les performances)"
+msgstr ""
+"Différentes options (activer ou désactiver peut améliorer les performances)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:134
@@ -5142,7 +5429,9 @@ msgstr "Activer les atlas de textures (OpenGL)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Cache all sprites per map (can use additional memory)"
-msgstr "Mettre en cache tous les sprites par carte (peut utiliser de la mémoire supplémentaire)"
+msgstr ""
+"Mettre en cache tous les sprites par carte (peut utiliser de la mémoire "
+"supplémentaire)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:155
@@ -5152,7 +5441,9 @@ msgstr "Mettre tous les sons en cache (peut utiliser plus de mémoire)"
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:160
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
-msgstr "Options critiques (NE change PAS si tu ne sais pas ce que tu es en train de faire)"
+msgstr ""
+"Options critiques (NE change PAS si tu ne sais pas ce que tu es en train de "
+"faire)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:164
@@ -5262,7 +5553,8 @@ msgstr "Récupérer les ID des joueurs et l'historique de vue"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:131
 msgid "Use special diagonal speed in players moving"
-msgstr "Utiliser une vitesse spéciale pour les déplacements diagonaux des joueurs"
+msgstr ""
+"Utiliser une vitesse spéciale pour les déplacements diagonaux des joueurs"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:135
@@ -5278,7 +5570,9 @@ msgstr "Créer un imprimé écran pour chaque échange réussi"
 #: src/gui/widgets/tabs/setup_players.cpp:143
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
-msgstr "Imiter le clique droit de la souris par un clique long (utile pour les interfaces tactiles)"
+msgstr ""
+"Imiter le clique droit de la souris par un clique long (utile pour les "
+"interfaces tactiles)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:148
@@ -5557,13 +5851,17 @@ msgstr "Aucun"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Impossible de passer en mode fenêtré, et l'ancienne résolution n'est également pas accessible !"
+msgstr ""
+"Impossible de passer en mode fenêtré, et l'ancienne résolution n'est "
+"également pas accessible !"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Impossible de passer en mode plein-écran, et l'ancienne résolution n'est également pas accessible !"
+msgstr ""
+"Impossible de passer en mode plein-écran, et l'ancienne résolution n'est "
+"également pas accessible !"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5573,7 +5871,8 @@ msgstr "Passage en plein écran"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:255
 msgid "Restart needed for changes to take effect."
-msgstr "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
+msgstr ""
+"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:281
@@ -5583,7 +5882,8 @@ msgstr "Activation d'OpenGL"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:283
 msgid "Applying change to OpenGL requires restart."
-msgstr "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
+msgstr ""
+"Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
 #. TRANSLATORS: resolution question dialog
 #: src/gui/widgets/tabs/setup_video.cpp:368
@@ -5604,7 +5904,9 @@ msgstr "Résolution de l'écran modifiée"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Certaines fenêtres pourraient être modifiées pour coïncider à la résolution réduite."
+msgstr ""
+"Certaines fenêtres pourraient être modifiées pour coïncider à la résolution "
+"réduite."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -5773,70 +6075,70 @@ msgid "Atk"
 msgstr "Atq"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr "Monstres prioritaires"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr "Attaquer les monstres"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr "Ignorer les monstres"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr "Amis: %u/%u"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr "Joueurs: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Le joueur %s a été invité dans la guilde %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Demande pour quitter la guilde %s effectuée."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "Inviter le membre dans la guilde"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Qui veux-tu inviter dans la guilde %s ?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "Quitter la guilde ?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Es-tu certain de vouloir quitter la guilde %s ?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr "Membres: %u/%u"
@@ -5848,41 +6150,41 @@ msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr "Portails: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "/party > Inviter l'utilisateur %s dans le groupe."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Tu as demandé à quitter le groupe %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "Inviter un joueur dans le groupe"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Qui voudrais-tu inviter dans le groupe %s ?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "Quitter le groupe ?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Es-tu certain de vouloir quitter le groupe %s ?"
@@ -5894,17 +6196,17 @@ msgid "Pik"
 msgstr "Pik"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr "Ramasser les objets"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr "Ignorer les objets"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr "Joueurs visibles: %d"
@@ -6137,10 +6439,8 @@ msgstr "Montant:"
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Créer"
 
@@ -6257,8 +6557,7 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6276,8 +6575,7 @@ msgstr "Distribues %d points"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6303,8 +6601,7 @@ msgstr "Apparence:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr "F"
 
@@ -6403,7 +6700,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "PV: %u/%u\nPM: %u/%u\nNiveau: %u\nExpérience: %u\nArgent: %s"
+msgstr ""
+"PV: %u/%u\n"
+"PM: %u/%u\n"
+"Niveau: %u\n"
+"Expérience: %u\n"
+"Argent: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6469,11 +6771,6 @@ msgid "Yes"
 msgstr "Oui"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr "Cible"
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr "Réseau"
@@ -6505,8 +6802,7 @@ msgstr "Éditer le Serveur"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Connexion..."
 
@@ -6575,8 +6871,8 @@ msgstr "Polices d'écriture"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -6872,15 +7168,13 @@ msgstr "Sujet:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr "Argent:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr "Objet:"
@@ -7282,173 +7576,142 @@ msgid "Up"
 msgstr "Augmenter"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Points de compétences: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr "Compétence choisie: %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "Compétence %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr "Compétence %u"
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niveau: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Compétence ratée: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Ajouter du texte à la compétence %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr "Texte: "
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "Inviter"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Invitation dans le groupe acceptée de la part de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Invitation dans le groupe de la part de %s refusée."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Invitation dans la guilde acceptée de la part de %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Invitation dans la guilde de la part de %s refusée."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "La guilde %s a été créée."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "Le groupe %s a été créé."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "Nom de la guilde"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "Choisis le nom de ta guilde."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
-msgstr "Tu as reçu une invitation pour rejoindre une guilde mais fais déjà parti d'une autre."
+msgstr ""
+"Tu as reçu une invitation pour rejoindre une guilde mais fais déjà parti "
+"d'une autre."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s t'a invité à rejoindre la guilde %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "Accepter l'invitation dans cette guilde"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
-msgstr "Tu as reçu une invitation pour rejoindre un groupe mais fais déjà parti d'un autre."
+msgstr ""
+"Tu as reçu une invitation pour rejoindre un groupe mais fais déjà parti d'un "
+"autre."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "Tu as été invité à rejoindre un groupe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Tu as été invité à rejoindre le groupe %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s t'a invité à rejoindre son groupe."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s t'a invité à rejoindre le groupe %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "Accepter l'invitation pour ce groupe"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "Impossible de créer le groupe. tu fais déjà partie d'un groupe."
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "Nom du groupe"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "Choisis le nom du groupe."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7588,14 +7851,17 @@ msgstr "Tu n'as pas assez d'argent."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "L'objet ne peux pas être ajouté. Tu ne peux pas ajouter deux fois le même objet dans cette fenêtre."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"L'objet ne peux pas être ajouté. Tu ne peux pas ajouter deux fois le même "
+"objet dans cette fenêtre."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
 msgid "Failed adding item. You can not trade equipped items."
-msgstr "L'ajout de l'objet a échoué. Tu ne peux pas échanger les objets que tu portes."
+msgstr ""
+"L'ajout de l'objet a échoué. Tu ne peux pas échanger les objets que tu "
+"portes."
 
 #. TRANSLATORS: updater window name
 #: src/gui/windows/updaterwindow.cpp:171
@@ -7675,25 +7941,25 @@ msgstr "Choix du monde"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "touche_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr "JBoutton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr "touche inconnue"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7701,7 +7967,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "touche u"
 
@@ -8859,7 +9125,9 @@ msgstr "Erreur inconnue du serveur de personnage."
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Impossible de créer ce personnage. Il est probable que ce nom soit déjà utilisé."
+msgstr ""
+"Impossible de créer ce personnage. Il est probable que ce nom soit déjà "
+"utilisé."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:160
@@ -8912,7 +9180,9 @@ msgstr "Le message privé n'a pu être envoyé, tu es ignoré par %s."
 #. TRANSLATORS: chat message
 #: src/net/ea/chatrecv.cpp:114
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "Le message privé n'a pas pu être envoyé, tu as été ignoré par tous les joueurs."
+msgstr ""
+"Le message privé n'a pas pu être envoyé, tu as été ignoré par tous les "
+"joueurs."
 
 #. TRANSLATORS: error header
 #: src/net/ea/gamerecv.cpp:67
@@ -9002,14 +9272,18 @@ msgstr "Rejeté par le serveur."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Tu as été banni de façon permanente du jeu. Merci de contacter l'équipe des MJs."
+msgstr ""
+"Tu as été banni de façon permanente du jeu. Merci de contacter l'équipe des "
+"MJs."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
 msgid ""
 "Client too old or wrong server type.\n"
 "Please update client on http://manaplus.org"
-msgstr "Le client est trop ancien où le type de serveur n'est pas bon.\nTu peux mettre à jour le client sur http://manaplus.org"
+msgstr ""
+"Le client est trop ancien où le type de serveur n'est pas bon.\n"
+"Tu peux mettre à jour le client sur http://manaplus.org"
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:146 src/net/eathena/loginrecv.cpp:84
@@ -9017,7 +9291,9 @@ msgstr "Le client est trop ancien où le type de serveur n'est pas bon.\nTu peux
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Tu as temporairement été banni du jeu jusqu'au %s.\nMerci de contacter l'équipe des MJs sur le forum."
+msgstr ""
+"Tu as temporairement été banni du jeu jusqu'au %s.\n"
+"Merci de contacter l'équipe des MJs sur le forum."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -9937,7 +10213,8 @@ msgstr "Impossible de rajouter un objet. Ton partenaire est surchargé."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:291
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Impossible de rajouter un objet. Ton partenaire n'a plus de place libre."
+msgstr ""
+"Impossible de rajouter un objet. Ton partenaire n'a plus de place libre."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:295
@@ -10104,14 +10381,18 @@ msgstr "Carte insérée."
 msgid ""
 "Deposit failed. You probably don't have this amount of money with you right "
 "now."
-msgstr "Le dépôt a échoué. Tu n'as probablement pas cette quantité d'argent avec toi en ce moment."
+msgstr ""
+"Le dépôt a échoué. Tu n'as probablement pas cette quantité d'argent avec toi "
+"en ce moment."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:427
 msgid ""
 "Withdraw failed. You probably don't have this amount of money in the bank "
 "right now."
-msgstr "Le retrait a échoué. Tu n'a probablement pas cette quantité d'argent dans la banque en ce moment."
+msgstr ""
+"Le retrait a échoué. Tu n'a probablement pas cette quantité d'argent dans la "
+"banque en ce moment."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:432
@@ -10126,7 +10407,9 @@ msgstr "La création de magasin d'achat a échoué. Trop de poids."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:440
 msgid "Buying store create failed. No items in store."
-msgstr "La création de magasin d'achat a échoué. Il n'y aucun article dans le magasin."
+msgstr ""
+"La création de magasin d'achat a échoué. Il n'y aucun article dans le "
+"magasin."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:444
@@ -10153,7 +10436,9 @@ msgstr "L'échange a échoué."
 msgid ""
 "The trade failed, because the entered amount of item is higher, than the "
 "buyer is willing to buy."
-msgstr "L'échange a échoué, parce que le montant de l'article est supérieure à se que l'acheteur est prêt à acheter."
+msgstr ""
+"L'échange a échoué, parce que le montant de l'article est supérieure à se "
+"que l'acheteur est prêt à acheter."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:465
@@ -10390,12 +10675,14 @@ msgstr "Affinage inconnu pour l'objet %s."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:650
 msgid "You can't add item to card because weight too high."
-msgstr "Tu ne peux pas ajouter l'objet à la carte car tu soulèves déjà trop de poids."
+msgstr ""
+"Tu ne peux pas ajouter l'objet à la carte car tu soulèves déjà trop de poids."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:654
 msgid "You can't add item to card because too many items."
-msgstr "Tu ne peux pas ajouter l'objet à la carte car tu as déjà trop d'objets."
+msgstr ""
+"Tu ne peux pas ajouter l'objet à la carte car tu as déjà trop d'objets."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:658
@@ -10476,7 +10763,8 @@ msgstr "La tentative d'ignorer le joueur a échoué."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:718
 msgid "Player ignore failed. Because too many ignores."
-msgstr "La tentative d'ignorer le joueur a échoué, tu ignores déjà trop de joueurs."
+msgstr ""
+"La tentative d'ignorer le joueur a échoué, tu ignores déjà trop de joueurs."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:722
@@ -10496,7 +10784,9 @@ msgstr "La tentative de retirer le joueur de votre liste d'ignorés a échoué."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:734
 msgid "Unknown player unignore failure."
-msgstr "La tentative de retirer le joueur de votre liste d'ignorés a échoué pour une raison inconnue."
+msgstr ""
+"La tentative de retirer le joueur de votre liste d'ignorés a échoué pour une "
+"raison inconnue."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:738
@@ -10569,7 +10859,9 @@ msgstr "L'adoption d'enfant a échoué. Ton niveau est trop bas."
 #: src/resources/notifications.h:816
 msgid ""
 "Child adoption failed. This player is already married and can't be a baby."
-msgstr "L'adoption d'enfant a échoué. Ce joueur est déjà marrié et ne peut donc pas être un bébé."
+msgstr ""
+"L'adoption d'enfant a échoué. Ce joueur est déjà marrié et ne peut donc pas "
+"être un bébé."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:821
@@ -10579,38 +10871,40 @@ msgstr "Position sauvegardée pour la compétence de téléportation."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:825
 msgid "Error saving location. Not enough skill level."
-msgstr "Erreur de sauvegarde de position. Tu n'as pas assez de niveaux de compétence."
+msgstr ""
+"Erreur de sauvegarde de position. Tu n'as pas assez de niveaux de compétence."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:829
 msgid "Error saving location. You do not have warp skill."
-msgstr "Erreur de sauvegarde de position. Tu n'as pas la compétence de téléportation."
+msgstr ""
+"Erreur de sauvegarde de position. Tu n'as pas la compétence de téléportation."
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr "Lvl: %d / %d"
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr "Inconnu:"
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr " / Mana: -%d"
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr "Portée: %d"
@@ -10621,11 +10915,6 @@ msgid "Ground"
 msgstr "Sol"
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr "Soi"
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr "Non utilisé"
@@ -10644,7 +10933,8 @@ msgstr "CiblePiège"
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10700,3 +10990,30 @@ msgstr "%d secondes"
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondes"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Le nom de la guilde est manquant."
+
+#~ msgid "Invite"
+#~ msgstr "Inviter"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "La guilde %s a été créée."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "Le groupe %s a été créé."
+
+#~ msgid "Guild Name"
+#~ msgstr "Nom de la guilde"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "Choisis le nom de ta guilde."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "Impossible de créer le groupe. tu fais déjà partie d'un groupe."
+
+#~ msgid "Party Name"
+#~ msgstr "Nom du groupe"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "Choisis le nom du groupe."
diff --git a/po/id.po b/po/id.po
index 10ed26142..448e4764e 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # adjieps <adjieps@yahoo.com>, 2011
 # adjieps <adjieps@yahoo.com>, 2011
@@ -13,14 +13,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/akaras/manaplus/language/"
+"id/)\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
@@ -34,7 +35,6 @@ msgstr "Data telah terunggah"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -54,10 +54,9 @@ msgstr "Data telah terunggah"
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -106,80 +105,86 @@ msgid "Uploaded log into:"
 msgstr "Mengunggah catatan ke:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr "Tidak dapat membuat tab pesan pribadi \"%s\"! Kemungkinan tab sudah ada."
+msgstr ""
+"Tidak dapat membuat tab pesan pribadi \"%s\"! Kemungkinan tab sudah ada."
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Nama kelompok hilang."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Buat kelompok"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Nama organisasi hilang."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Organisasi target:"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Tetapkan sebuah nama."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "Kembalikan pengalihan obrolan."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "Pesan menutup obrolan."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "Kembalikan pengalihan obrolan."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "Pesan sekarang menutup obrolan."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -452,8 +457,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "Sepenuhnya tolak"
 
@@ -537,8 +542,8 @@ msgstr "Bantuan"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -1240,16 +1245,16 @@ msgstr "Pesan"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr "Hidupkan"
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Kamu memmbawa lebih dari separuh beratmu. Kamu tidak bisa regenerasidarah."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Kamu memmbawa lebih dari separuh beratmu. Kamu tidak bisa regenerasidarah."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
@@ -1265,8 +1270,7 @@ msgstr "Kamu membawa kurang dari separuh beratmu. Kamu bisa regenerasi darah."
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "dasar"
 
@@ -1427,8 +1431,8 @@ msgstr "Super besar (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(dasar)"
 
@@ -1734,8 +1738,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1754,58 +1758,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "Buat kelompok"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "Batal"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1827,7 +1779,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1841,8 +1793,8 @@ msgstr "Dagang"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "Serang"
@@ -1853,36 +1805,36 @@ msgstr "Serang"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "Bisikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "Menyembuhkan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "Keluarkan dari organisasi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 msgid "Change pos in guild"
 msgstr "Ubah posisi di organisasi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "Undang ke organisasi"
 
@@ -1890,7 +1842,7 @@ msgstr "Undang ke organisasi"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "Sembunyikan"
 
@@ -1907,9 +1859,9 @@ msgstr "Sembunyikan"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "Jalan"
@@ -1918,7 +1870,7 @@ msgstr "Jalan"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Berbicara"
@@ -1933,7 +1885,7 @@ msgstr "Berbicara"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1951,7 +1903,7 @@ msgstr "Beli"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1963,26 +1915,26 @@ msgstr "Jual"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr "Tambah komentar"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 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:320
+#: src/gui/popups/popupmenu.cpp:321
 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:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "Tambah ke daftar serangan"
 
@@ -1990,19 +1942,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:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 msgid "Add to ignore list"
 msgstr "Tambah ke daftar abaikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr "Berjalan ke master"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr "Api"
 
@@ -2010,7 +1962,7 @@ msgstr "Api"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr "Beri makan"
 
@@ -2020,8 +1972,8 @@ msgstr "Beri makan"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "Ubah nama"
@@ -2030,13 +1982,13 @@ msgstr "Ubah nama"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr "Bunuh"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr "Jatuhkan rampasan"
 
@@ -2044,7 +1996,7 @@ msgstr "Jatuhkan rampasan"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2057,7 +2009,7 @@ msgstr "Lepaskan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr "Kembali ke telur"
 
@@ -2065,39 +2017,88 @@ 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:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "Tambah nama ke obrolan"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "Batal"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Pemain"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Keluarkan dari kelompok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "Ambil"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Tambah ke obrolan"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "Item Peta"
 
@@ -2107,28 +2108,28 @@ msgstr "Item Peta"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr "Jebakan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr "Gerakkan kamera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr ""
 
@@ -2137,7 +2138,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2145,69 +2146,68 @@ msgstr "Perlengkapan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr "Bersihkan perlengkapan"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Mantra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 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:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "Nonaktifkan sorotan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr "Aktifkan sorotan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 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:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "Hapus nama"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "Aktifkan keluar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 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:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "Meninggalkan"
 
@@ -2217,116 +2217,116 @@ msgstr "Meninggalkan"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr "Salin ke papan"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "Ubah posisi Organisasi"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr "jendela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr "Buka"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr "Tutup"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr "Pemain"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr "Orang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr "Prajurit"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 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:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "Nama:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr "Komentar pemain           "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr "komentar                      "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 msgid "Add to trade"
 msgstr "Tambah ke dagangan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1745
+#: src/gui/popups/popupmenu.cpp:1762
 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:1750
+#: src/gui/popups/popupmenu.cpp:1767
 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:1754
+#: src/gui/popups/popupmenu.cpp:1771
 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:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr "Tambah semua ke dagangan"
 
@@ -2335,8 +2335,8 @@ msgstr "Tambah semua ke dagangan"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2344,63 +2344,63 @@ msgstr "Simpan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "Simpan 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "Simpan setengah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr "Simpan semua-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Simpan semua"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "Ambil"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "Ambil 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 msgid "Retrieve half"
 msgstr "Ambil setengah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr "Ambil semua-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Ambil semua"
 
@@ -2411,17 +2411,17 @@ msgstr "Ambil semua"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Gunakan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr "Bersihkan jendela buang"
 
@@ -2430,43 +2430,43 @@ msgstr "Bersihkan jendela buang"
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "Sembunyi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "Tampil"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 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:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr "Salin ke obrolan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "Bergerak keatas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr "Bergerak kebawah"
 
@@ -2474,175 +2474,245 @@ msgstr "Bergerak kebawah"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr "Tanggalkan baju"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr "Salin"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr "Tempel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr "Buka tautan"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr "Tampil jendela"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "Asal"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr "Target"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Perbaiki posisi otomatis"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr "Pribadi"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 msgid "Disregard"
 msgstr "Abaikan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 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:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr "Daftar hitam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr "Set sebagai musuh"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr "Hapus"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "Berteman"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "Batal pengabaian"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "Ikuti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "Beli(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "Jual(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "Undang ke kelompok"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr "Gabung obrolan %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "Perlihatkan Item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr "Hapus dari daftar pungut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Add to pickup list"
 msgstr "Tambah ke daftar pungut"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr "Batal proteksi item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr "Proteksi item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Buang..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "Buang semua"
 
@@ -2650,38 +2720,38 @@ msgstr "Buang semua"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Buang"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr ""
 
@@ -2690,7 +2760,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2699,7 +2769,7 @@ msgstr "Perbekalan"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr "Tempat penyimpanan"
 
@@ -2708,7 +2778,7 @@ msgstr "Tempat penyimpanan"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2717,31 +2787,31 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Perintah"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr "Cek ip"
 
@@ -2749,7 +2819,7 @@ msgstr "Cek ip"
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr "Pergi ke"
 
@@ -2757,109 +2827,109 @@ msgstr "Pergi ke"
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr "Panggil balik"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2867,31 +2937,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr "Keluarkan"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2900,19 +2970,19 @@ msgstr ""
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2924,8 +2994,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2933,63 +3003,82 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr "Komando GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "Buat kelompok"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr ""
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Perbaiki posisi otomatis"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "Tipe: %s"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3524,6 +3613,11 @@ msgstr "Lang"
 msgid "Party"
 msgstr "Kelompok"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Nama kelompok hilang."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3532,15 +3626,13 @@ msgstr "Berbagi item diaktifkan."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Berbagi item dimatikan."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Tidak bisa berbagi item."
 
@@ -3551,22 +3643,19 @@ msgstr "Berbagi item tidak diketahui."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Berbagi pengalaman diaktifkan."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Berbagi pengalaman dimatikan."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Tidak bisa berbagi pengalaman."
 
@@ -4007,15 +4096,15 @@ msgstr "Proteksi fokus obrolan"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Warna"
 
@@ -4039,9 +4128,11 @@ msgstr "Tampil daftar warna obrolan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4068,9 +4159,11 @@ msgstr "Batas maksimal karakter di garis obrolan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4081,7 +4174,9 @@ msgstr "Batas maksimal baris di obrolan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4122,8 +4217,8 @@ msgstr "Tampil riwayat obrolan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4134,9 +4229,11 @@ msgstr "Tampil pesan kelompok online"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4147,9 +4244,11 @@ msgstr "Tampil pesan guild online"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4165,9 +4264,13 @@ msgstr "Sembunyi pesan toko"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4180,7 +4283,8 @@ msgstr "Tampilkan pesan MVP"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4199,9 +4303,12 @@ msgstr "Masukkan semua bisikan kedalam tab"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4212,7 +4319,8 @@ msgstr "Riwayat pesan sihir di jendela debug"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4225,9 +4333,11 @@ msgstr "Tujukkan pesan server di jendela debug"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4252,9 +4362,11 @@ msgstr "Aktifkan tab gm"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4265,7 +4377,8 @@ msgstr "Aktifkan tab bahasa"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4278,7 +4391,9 @@ msgstr "Tampilkan semua bahasa pesan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4291,7 +4406,9 @@ msgstr "Perbolehkan jendela pertarungan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4317,7 +4434,10 @@ msgstr "Atur besar tab obrolan bila dibutuhkan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4352,7 +4472,8 @@ msgstr "Sorot kata (dipisan dengan koma)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4365,7 +4486,8 @@ msgstr "Nama abaikan global (dipisah dengan koma)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4378,9 +4500,12 @@ msgstr "Tampil tombol emosi di obrolan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4469,11 +4594,6 @@ msgid "Unassign"
 msgstr "Batal menetapkan"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "Asal"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Reset semua key"
@@ -5758,70 +5878,70 @@ msgid "Atk"
 msgstr "Sedang meninggalkan keyboard"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr "mob prioritas"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr "serang mob"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr "Abaikan mobs"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Pengguna yang diajak %s ke organisasi %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Permintaan %s keluar dari Organisasi."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "Tinggalkan organisasi?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Apakah anda yakin ingin meninggalkan organisasi %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
@@ -5833,41 +5953,41 @@ msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Pengguna yang diajak %s ke kelompok."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "Mengundang pengguna ke kelompok"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
@@ -5879,17 +5999,17 @@ msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
@@ -6122,10 +6242,8 @@ msgstr ""
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Buat"
 
@@ -6242,8 +6360,7 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6261,8 +6378,7 @@ msgstr "Tolong distribusikan %d point"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6288,8 +6404,7 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr ""
 
@@ -6454,11 +6569,6 @@ msgid "Yes"
 msgstr "Ya"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr "Target"
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr "Jaring"
@@ -6490,8 +6600,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Menyambung"
 
@@ -6560,8 +6669,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr "Tak diketahui"
 
@@ -6855,15 +6964,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7265,173 +7372,138 @@ msgid "Up"
 msgstr "Naik"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr "poin Skill yang tersedia: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr ""
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr ""
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr ""
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr ""
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr ""
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr ""
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr ""
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr ""
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7571,8 +7643,7 @@ msgstr "Anda tidak memiliki cukup uang."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #. TRANSLATORS: trade error
@@ -7658,25 +7729,25 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7684,7 +7755,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -10570,30 +10641,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr "Tipe: %s"
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr "Tak diketahui:"
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr " / Mana: -%d"
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr "Jarak: %d"
@@ -10604,11 +10675,6 @@ msgid "Ground"
 msgstr "Tanah"
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr "Pribadi"
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr "Tak berguna"
@@ -10627,7 +10693,8 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
+msgstr ""
+"Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10683,3 +10750,6 @@ msgstr "%d detik"
 #, c-format
 msgid "%d seconds"
 msgstr "%d detik"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Nama organisasi hilang."
diff --git a/po/it.po b/po/it.po
index 950a9aa11..fdf5a4e78 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Alessandro Camplese <ale.camplese@gmail.com>, 2013
 # Alessandro Camplese <ale.camplese@gmail.com>, 2013
@@ -19,14 +19,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/it/)\n"
+"Language-Team: Italian (http://www.transifex.com/akaras/manaplus/language/"
+"it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -40,7 +41,6 @@ msgstr "File caricato"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -60,10 +60,9 @@ msgstr "File caricato"
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -112,80 +111,86 @@ msgid "Uploaded log into:"
 msgstr "Carica log in:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr "Impossibile creare una scheda sussurro \"%s\"! Probabilmente esiste già."
+msgstr ""
+"Impossibile creare una scheda sussurro \"%s\"! Probabilmente esiste già."
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Manca il nome del party."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Crea gruppo"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Manca il nome della gilda."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Gilda target:"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Prego specificare un nome."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "Attiva/disattiva la chat."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "I messaggi chiudono la conversazione."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "Attiva/disattiva la chat adesso."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "I messaggi adesso chiudono la chat."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -459,8 +464,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "Ignora completamente."
 
@@ -544,8 +549,8 @@ msgstr "Aiuto"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -702,7 +707,9 @@ msgstr "  -c --character      : Effettua il Login con questo personaggio"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:77
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Effettua il Login con questo nome Server o a questo indirizzo IP"
+msgstr ""
+"  -s --server         : Effettua il Login con questo nome Server o a questo "
+"indirizzo IP"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:80
@@ -742,7 +749,8 @@ msgstr "  -L --localdata-dir  : Directory da usare per i dati locali"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:103
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Scegli la Directory per salvare gli Screenshots"
+msgstr ""
+"     --screenshot-dir : Scegli la Directory per salvare gli Screenshots"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:106
@@ -1247,21 +1255,23 @@ msgstr "Messaggio"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Stai trasportando piu' della meta' del tuo peso. Non puoi piu' rigenerare vita."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Stai trasportando piu' della meta' del tuo peso. Non puoi piu' rigenerare "
+"vita."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Stai trasportando meno della meta' del tuo peso. Ora puoi rigenerare vita."
+msgstr ""
+"Stai trasportando meno della meta' del tuo peso. Ora puoi rigenerare vita."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1272,8 +1282,7 @@ msgstr "Stai trasportando meno della meta' del tuo peso. Ora puoi rigenerare vit
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "Predefinito"
 
@@ -1434,8 +1443,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(default)"
 
@@ -1741,8 +1750,8 @@ msgstr "Stanza di chat: %s"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1761,58 +1770,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "Crea gruppo"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "Annulla"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1834,7 +1791,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1848,8 +1805,8 @@ msgstr "Commercia"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "Attacco"
@@ -1860,36 +1817,36 @@ msgstr "Attacco"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "Sussurra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "Cura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "Caccia dalla gilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 msgid "Change pos in guild"
 msgstr "Cambia ruolo nella gilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "Invita nell gilda"
 
@@ -1897,7 +1854,7 @@ msgstr "Invita nell gilda"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "Nascondi"
 
@@ -1914,9 +1871,9 @@ msgstr "Nascondi"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "Movimento"
@@ -1925,7 +1882,7 @@ msgstr "Movimento"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Parla"
@@ -1940,7 +1897,7 @@ msgstr "Parla"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1958,7 +1915,7 @@ msgstr "Compra"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1970,26 +1927,26 @@ msgstr "Vendi"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr "Aggiungi commento"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 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:320
+#: src/gui/popups/popupmenu.cpp:321
 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:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "Aggiungi alla lista Attacco"
 
@@ -1997,19 +1954,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:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 msgid "Add to ignore list"
 msgstr "Aggiungi alla lista Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr ""
 
@@ -2017,7 +1974,7 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr ""
 
@@ -2027,8 +1984,8 @@ msgstr ""
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "Rinomina"
@@ -2037,13 +1994,13 @@ msgstr "Rinomina"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr ""
 
@@ -2051,7 +2008,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2064,7 +2021,7 @@ msgstr "Togli"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr ""
 
@@ -2072,39 +2029,88 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "Aggiungi nome alla chat"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "Annulla"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Giocatori"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Caccia dal party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "Raccogli"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Aggiungi alla chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "Oggetto mappa"
 
@@ -2114,28 +2120,28 @@ msgstr "Oggetto mappa"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "Rimuovi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr "Teletrasporto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr "Muovi telecamera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr ""
 
@@ -2144,7 +2150,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2152,69 +2158,68 @@ msgstr "Attrezzatura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 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:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "Cancella"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "Disabilita highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr "Abilita highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 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:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "Rimuovi nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "Abilita modalita' Away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 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:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "Lascia"
 
@@ -2224,116 +2229,116 @@ msgstr "Lascia"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr "Copia negli appunti"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "Cambia posizione nella gilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr "Giocatore"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 msgid "Rename map sign          "
 msgstr "Rinomina mappa           "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr "Commento giocatore:       "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr "Commento:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 msgid "Add to trade"
 msgstr "Aggiungi allo scambio"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1745
+#: src/gui/popups/popupmenu.cpp:1762
 msgid "Add to trade 10"
 msgstr "Aggiungi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1767
 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:1754
+#: src/gui/popups/popupmenu.cpp:1771
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr "Aggiungi tutti"
 
@@ -2342,8 +2347,8 @@ msgstr "Aggiungi tutti"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2351,63 +2356,63 @@ msgstr "Magazzino"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "Salva 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "Salva metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Salva tutto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "Recupera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "Ritira 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 msgid "Retrieve half"
 msgstr "Ritira metà"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Ritira tutto"
 
@@ -2418,17 +2423,17 @@ msgstr "Ritira tutto"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Usa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr ""
 
@@ -2437,43 +2442,43 @@ msgstr ""
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "Nascondi"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "Mostra"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 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:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr "Copia in Chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "Muovi Su"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr "Muovi Giù"
 
@@ -2481,175 +2486,245 @@ msgstr "Muovi Giù"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr "Spogliati"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr "Copia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr "Incolla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr "Apri link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr "Mostra Finestra"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr "Livello massimo"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "Predefinito"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr "Target"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Correggi posizione automaticamente"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 msgid "Disregard"
 msgstr "Ignora"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 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:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr "Lista nera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr "Identifica come nemico"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr "Elimina"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "Chiedi amicizia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "Stop Ignora"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "Segui"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "Compra (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "Vendi (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "Invita nel party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "Mostra Oggetti"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr "Rimuovi dalla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Add to pickup list"
 msgstr "Aggiungi alla lista 'Raccogli'"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Lascia..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "Lascia tutto"
 
@@ -2657,38 +2732,38 @@ msgstr "Lascia tutto"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Lascia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr ""
 
@@ -2697,7 +2772,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2706,7 +2781,7 @@ msgstr "Inventario"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr "Magazzino"
 
@@ -2715,7 +2790,7 @@ msgstr "Magazzino"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2724,31 +2799,31 @@ msgstr "Carrello"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Comandi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr ""
 
@@ -2756,7 +2831,7 @@ msgstr ""
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr ""
 
@@ -2764,109 +2839,109 @@ msgstr ""
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2874,31 +2949,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr "Caccia"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2907,19 +2982,19 @@ msgstr ""
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2931,8 +3006,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2940,63 +3015,82 @@ msgstr "Informazioni"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "Lasciare il gruppo?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr "Livello: %d / %d"
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr "Livello: Sconosciuto"
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Correggi posizione automaticamente"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "Party: %s"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3531,6 +3625,11 @@ msgstr ""
 msgid "Party"
 msgstr "Party"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Manca il nome del party."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3539,15 +3638,13 @@ msgstr "Gestione in comune oggetti attivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Gestione in comune oggetti disattivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Gestione in comune oggetti non puo' essere attivata."
 
@@ -3558,22 +3655,19 @@ msgstr "Oggetti in comune sconosciuti."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Esperienza in comune attivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Esperienza in comune disattivata."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Esperienza in comune non puo' essere attivata."
 
@@ -4014,15 +4108,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Colori"
 
@@ -4046,9 +4140,11 @@ msgstr "Mostra colori per la chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4075,9 +4171,11 @@ msgstr "Limita un massimo di caratteri per messaggio"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4088,7 +4186,9 @@ msgstr "Limita un massimo di messaggi per la chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4129,8 +4229,8 @@ msgstr "Mostra la storia della chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4141,9 +4241,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4154,9 +4256,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4172,9 +4276,13 @@ msgstr "Nascondi i messaggi del negozio"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4187,7 +4295,8 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4206,9 +4315,12 @@ msgstr "Sposta tutti i sussurri in schede"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4219,7 +4331,8 @@ msgstr "Salva i messaggi delle magie nella debug tab"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4232,9 +4345,11 @@ msgstr "Mostra i messaggi del server nella chat di debug"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4259,9 +4374,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4272,7 +4389,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4285,7 +4403,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4298,7 +4418,9 @@ msgstr "Abilita la chat di battaglia"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4324,7 +4446,10 @@ msgstr "Dimensione finestra dialogo dinamica"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4359,7 +4484,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4372,7 +4498,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4385,9 +4512,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4476,11 +4606,6 @@ msgid "Unassign"
 msgstr "Annullare l'assegnazione"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "Predefinito"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Resetta tutte le scorciatoie"
@@ -4501,7 +4626,9 @@ msgstr "Sono stati rilevati conflitti nei tasti."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Conflitto tra le chiavi \"%s\" e \"%s\". Risolvi, o potrebbero capitare inconvenienti."
+msgstr ""
+"Conflitto tra le chiavi \"%s\" e \"%s\". Risolvi, o potrebbero capitare "
+"inconvenienti."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5549,13 +5676,17 @@ msgstr "Nessuno"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Cambio verso la modalità finestra fallito e anche il ripristino modalità precedente è fallito!"
+msgstr ""
+"Cambio verso la modalità finestra fallito e anche il ripristino modalità "
+"precedente è fallito!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Cambio verso la modalità schermo intero fallito e anche il ripristino della modalità precedente è fallito!"
+msgstr ""
+"Cambio verso la modalità schermo intero fallito e anche il ripristino della "
+"modalità precedente è fallito!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5596,7 +5727,9 @@ msgstr "RIsoluzione schermo cambiata"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Alcune finestre potrebbero essere spostate per addattarsi alla risoluzione ridotta."
+msgstr ""
+"Alcune finestre potrebbero essere spostate per addattarsi alla risoluzione "
+"ridotta."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -5765,70 +5898,70 @@ msgid "Atk"
 msgstr "Attacco"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr "Priorità mobs"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr "Attacca mobs"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr "Ignora mobs"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Invitato utente %s alla gilda %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Abbandono gilda %s richiesto."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "invita qualcuno nel gruppo"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Chi vorresti invitare alla gilda %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "Lasciare la gilda?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Sei sicuro di voler lasciare la gilda %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
@@ -5840,41 +5973,41 @@ msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Invitato utente al gruppo %s."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Abbandono gruppo %s richiesto."
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "Invita qualcuno nel gruppo"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Chi vorresti invitare al gruppo %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "Lasciare il gruppo?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Sei sicuro di voler lasciare il gruppo %s?"
@@ -5886,17 +6019,17 @@ msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr "Raccogli oggetti"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr "Ignora oggetti"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
@@ -6129,10 +6262,8 @@ msgstr "Quantita':"
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Crea"
 
@@ -6249,8 +6380,7 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6268,8 +6398,7 @@ msgstr "Distribuire %d punti"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6295,8 +6424,7 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr "F"
 
@@ -6395,7 +6523,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "Hp: %u%u\nMp: %u%u\nLivello: %u\nEsperienza: %u\nSoldi: %s"
+msgstr ""
+"Hp: %u%u\n"
+"Mp: %u%u\n"
+"Livello: %u\n"
+"Esperienza: %u\n"
+"Soldi: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6461,11 +6594,6 @@ msgid "Yes"
 msgstr "Sì"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr "Target"
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr "Rete"
@@ -6497,8 +6625,7 @@ msgstr "Modifica Server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Connetti"
 
@@ -6567,8 +6694,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr ""
 
@@ -6864,15 +6991,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7274,173 +7399,138 @@ msgid "Up"
 msgstr "Su"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Punti abilità disponibili: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr "Abilità impostata %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "Abilità %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "Invita"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accettato invito al gruppo da parte di %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rifiutato invito al gruppo da parte di %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accettato invito alla gilda da parte di %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rifiutato invito alla gilda da parte di %s."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Stai creando una gilda chiamata %s."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "Stai creando un party chiamato %s."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "Nome della gilda"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "Scegli un nome per la tua gilda."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr "Ricevuto invito ad una gilda, ma ne hai già una."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s ti ha invitato ad entrare nella gilda %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "Accetta invito alla gilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "Ricevuta richiesta di party, ma ne esiste già una."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "Sei stato invitato ad entrare in un party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Sei stato invitato ad entrare nel gruppo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s ti ha invitato ad unirti al suo party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s ti ha invitato ad unirti al party %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "Accetta invito nel party"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "Impossibile creare un party, sei già in un party"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "Nome del gruppo"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "Scegli un nome per il tuo party."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7580,9 +7670,10 @@ msgstr "Non hai abbastanza denaro."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla finestra."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
+"finestra."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -7667,25 +7758,25 @@ msgstr "Scegli parola"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr "pulsante sconosciuto"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7693,7 +7784,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -8994,7 +9085,9 @@ msgstr "Rifiutato dal server."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Il tuo account è stato bandito permanentemente dal gioco. Contattare il GM per maggiori informazioni."
+msgstr ""
+"Il tuo account è stato bandito permanentemente dal gioco. Contattare il GM "
+"per maggiori informazioni."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -9009,7 +9102,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Sei stato temporaneamente bannato dal gioco fino a %s.\nContatta il team GM sul forum."
+msgstr ""
+"Sei stato temporaneamente bannato dal gioco fino a %s.\n"
+"Contatta il team GM sul forum."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10579,30 +10674,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr ""
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -10613,11 +10708,6 @@ msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr ""
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr ""
@@ -10636,7 +10726,9 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false\" (falso), \"1\", \"0\"."
+msgstr ""
+"Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false"
+"\" (falso), \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10692,3 +10784,30 @@ msgstr "%d secondi"
 #, c-format
 msgid "%d seconds"
 msgstr "%d secondi"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Manca il nome della gilda."
+
+#~ msgid "Invite"
+#~ msgstr "Invita"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "Stai creando una gilda chiamata %s."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "Stai creando un party chiamato %s."
+
+#~ msgid "Guild Name"
+#~ msgstr "Nome della gilda"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "Scegli un nome per la tua gilda."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "Impossibile creare un party, sei già in un party"
+
+#~ msgid "Party Name"
+#~ msgstr "Nome del gruppo"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "Scegli un nome per il tuo party."
diff --git a/po/ja.po b/po/ja.po
index 3466e32e0..ff6abceb5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Candy <HarajukuCupcakes@gmail.com>, 2013
@@ -14,14 +14,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/akaras/manaplus/language/"
+"ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
@@ -35,7 +36,6 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -55,10 +55,9 @@ msgstr ""
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -107,80 +106,85 @@ msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
 msgstr ""
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "パーティ名がありません."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "パーティを作る"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "ギルド名がありません."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "ターゲットギルド:"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "名前を入力してください."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "改行キーでチャット入力ができます."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "チャットを閉じます."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "改行キーでチャット入力ができます."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "チャットを閉じます."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -453,8 +457,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "完全無視"
 
@@ -538,8 +542,8 @@ msgstr "ヘルプ"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -716,7 +720,9 @@ msgstr ""
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : デフォルトで使用するキャラクターサーバーとキャラクターを選択する"
+msgstr ""
+"  -D --default        : デフォルトで使用するキャラクターサーバーとキャラク"
+"ターを選択する"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:93
@@ -751,7 +757,8 @@ msgstr ""
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --tests          : ドライバーと自動コンフィグレーションのテストを始める"
+msgstr ""
+"  -T --tests          : ドライバーと自動コンフィグレーションのテストを始める"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -1241,15 +1248,14 @@ msgstr "メッセージ"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "インベントリーが体重の半分以上の為、体力は回復できません."
 
 #. TRANSLATORS: weight message
@@ -1266,8 +1272,7 @@ msgstr "インベントリーが体重の半分以下になった為、体力は
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "デフォルト"
 
@@ -1428,8 +1433,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(デフォルト)"
 
@@ -1735,8 +1740,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1755,58 +1760,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "パーティを作る"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "キャンセル"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1828,7 +1781,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1842,8 +1795,8 @@ msgstr "トレード"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "攻撃"
@@ -1854,36 +1807,36 @@ msgstr "攻撃"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "ささやく"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "HP回復"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "ギルドから一時的に追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 msgid "Change pos in guild"
 msgstr "ギルドでの役割を変更"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "ギルドへ招待"
 
@@ -1891,7 +1844,7 @@ msgstr "ギルドへ招待"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "消す"
 
@@ -1908,9 +1861,9 @@ msgstr "消す"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "動く"
@@ -1919,7 +1872,7 @@ msgstr "動く"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "話す"
@@ -1934,7 +1887,7 @@ msgstr "話す"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1952,7 +1905,7 @@ msgstr "買う"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1964,26 +1917,26 @@ msgstr "売る"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr "コメントをする"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 msgid "Remove from attack list"
 msgstr "攻撃リストから削除する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:320
+#: src/gui/popups/popupmenu.cpp:321
 msgid "Add to priority attack list"
 msgstr "攻撃優先リストへ追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "攻撃リストへ追加する"
 
@@ -1991,19 +1944,19 @@ msgstr "攻撃リストへ追加する"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 msgid "Add to ignore list"
 msgstr "攻撃無視リストへ追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr ""
 
@@ -2011,7 +1964,7 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr ""
 
@@ -2021,8 +1974,8 @@ msgstr ""
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "名前を変更する"
@@ -2031,13 +1984,13 @@ msgstr "名前を変更する"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr ""
 
@@ -2045,7 +1998,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2058,7 +2011,7 @@ msgstr "取外す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr ""
 
@@ -2066,39 +2019,88 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "名前をチャットへ追加する"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "キャンセル"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "プレイヤー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "パーティから一時的に追い出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "拾う"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "チャットに追加"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "マップアイテム"
 
@@ -2108,28 +2110,28 @@ msgstr "マップアイテム"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "削除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr "ワープ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr "カメラを動かす"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr ""
 
@@ -2138,7 +2140,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2146,69 +2148,68 @@ msgstr "服装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr "服装を削除する"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "呪文"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 msgid "Edit spell"
 msgstr "呪文を編集する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "クリア"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "強調表示を無効"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr "強調表示を有効"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 msgid "Don't remove name"
 msgstr "名前を消さない"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "名前を削除する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "AFKを有効にする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 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:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "退会"
 
@@ -2218,116 +2219,116 @@ msgstr "退会"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr "クリップボードにコピー"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "ギルドポジションを変更"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr "プレイヤー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 msgid "Rename map sign          "
 msgstr "マップサインの名前を変更 "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "名前:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr "プレイヤーコメント        "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr "コメント:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 msgid "Add to trade"
 msgstr "トレードウィンドウに追加"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1745
+#: src/gui/popups/popupmenu.cpp:1762
 msgid "Add to trade 10"
 msgstr "トレードウィンドウに10追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1767
 msgid "Add to trade half"
 msgstr "トレードウィンドウに半分追加する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1771
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr "トレードウィンドウに全て追加する"
 
@@ -2336,8 +2337,8 @@ msgstr "トレードウィンドウに全て追加する"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2345,63 +2346,63 @@ msgstr "保管"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "10 保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "半分保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "全部保存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "10 取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 msgid "Retrieve half"
 msgstr "半分取出す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "全部取出す"
 
@@ -2412,17 +2413,17 @@ msgstr "全部取出す"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr "ドロップ窓を消す"
 
@@ -2431,43 +2432,43 @@ msgstr "ドロップ窓を消す"
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "非表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "表示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 msgid "Reset yellow bar"
 msgstr "黄色バーをリセットする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr "チャットへコピーする"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "上へ移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr "下へ移動"
 
@@ -2475,175 +2476,245 @@ msgstr "下へ移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr "脱ぐ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr "コピー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr "ペースト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "標準に戻す"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr "ターゲット"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "自動で位置を修正"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 msgid "Disregard"
 msgstr "無視する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr "ブラックリスト"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr "敵に設定する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr "消す"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "友達になる"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "完全無視解除"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "フォロー"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "買う (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "売る (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "パーティへ招待"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "アイテムを表示する"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "落とす..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "全て落とす"
 
@@ -2651,38 +2722,38 @@ msgstr "全て落とす"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "落とす"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr ""
 
@@ -2691,7 +2762,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2700,7 +2771,7 @@ msgstr "インベントリー"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr "倉庫"
 
@@ -2709,7 +2780,7 @@ msgstr "倉庫"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2718,31 +2789,31 @@ msgstr "カート"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "コマンド"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr ""
 
@@ -2750,7 +2821,7 @@ msgstr ""
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr ""
 
@@ -2758,109 +2829,109 @@ msgstr ""
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2868,31 +2939,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr "追い出す"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2901,19 +2972,19 @@ msgstr ""
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2925,8 +2996,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2934,63 +3005,82 @@ msgstr "情報"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "パーティーから退会しますか?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr ""
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "自動で位置を修正"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "パーティ: %s"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3525,6 +3615,11 @@ msgstr ""
 msgid "Party"
 msgstr "パーティー"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "パーティ名がありません."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3533,15 +3628,13 @@ msgstr "アイテム共有モード有効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "アイテム共有モード無効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "アイテム共有モード不可能."
 
@@ -3552,22 +3645,19 @@ msgstr "アイテム共有モード不明."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Expシェアモード有効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Expシェアモード無効."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Expシェアモード不可能."
 
@@ -4008,15 +4098,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "色"
 
@@ -4040,9 +4130,11 @@ msgstr "チャットの文字色リストを表示"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4069,9 +4161,11 @@ msgstr "チャットで一行に表示する最大文字数を制限する"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4082,7 +4176,9 @@ msgstr "チャットで表示する最大行数を制限する"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4123,8 +4219,8 @@ msgstr "チャット履歴を表示"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4135,9 +4231,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4148,9 +4246,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4166,9 +4266,13 @@ msgstr "売買メッセージを隠す"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4181,7 +4285,8 @@ msgstr "MVPメッセージを表示する"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4200,9 +4305,12 @@ msgstr "ささやきををタブで表示する"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4213,7 +4321,8 @@ msgstr "デバッグタブに呪文をログする"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4226,9 +4335,11 @@ msgstr "デバッグタブにサーバーメッセージをログする"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4253,9 +4364,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4266,7 +4379,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4279,7 +4393,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4292,7 +4408,9 @@ msgstr "バトルタブを有効"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4318,7 +4436,10 @@ msgstr "チャットタブをリサイズする"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4353,7 +4474,8 @@ msgstr "文字をハイライト (コンマで区切る)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4366,7 +4488,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4379,9 +4502,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4470,11 +4596,6 @@ msgid "Unassign"
 msgstr "割り当て解除"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "標準に戻す"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "全てのキーをリセット"
@@ -4495,7 +4616,9 @@ msgstr "ショートカットキーが重複しています."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれません."
+msgstr ""
+"\"%s\"と\"%s\"キーが重複しています。 ゲームプレイに悪い影響が出るかもしれませ"
+"ん."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5759,70 +5882,70 @@ msgid "Atk"
 msgstr "攻撃"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr "優先される敵"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr "敵を攻撃する"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr "無視している敵"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "ユーザー %sを、ギルド %sに招待しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "ギルド %sへ退会届を出しました."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "ギルドへメンバーを招待しました"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "ギルド %sに誰を招待しますか?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "ギルドから退会しますか?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "ギルド %sから本当に退会しますか?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
@@ -5834,41 +5957,41 @@ msgid "Nav"
 msgstr "ナビ"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "ユーザー %s をパーティに招待しました."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr "パーティ %sへ退会届を出しました."
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "メンバーをパーティに招待しました"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "パーティ %sに誰を招待しますか?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "パーティーから退会しますか?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "パーティ %sから本当に退会しますか?"
@@ -5880,17 +6003,17 @@ msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
@@ -6123,10 +6246,8 @@ msgstr "量:"
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "作成"
 
@@ -6243,8 +6364,7 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6262,8 +6382,7 @@ msgstr "%d ポイントを振り分けてください"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6289,8 +6408,7 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr "友達"
 
@@ -6455,11 +6573,6 @@ msgid "Yes"
 msgstr "はい"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr "ターゲット"
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr "ネット"
@@ -6491,8 +6604,7 @@ msgstr "サーバー編集"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "接続"
 
@@ -6561,8 +6673,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr ""
 
@@ -6856,15 +6968,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7266,173 +7376,138 @@ msgid "Up"
 msgstr "上"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr "スキルポイント: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr "スキルセット %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "スキル %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr "周囲"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "招待"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "%sからのパーティ招待を承認しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "%sからのパーティ招待を拒否しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%sからのギルド招待を承認しました."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%sからのギルド招待を拒否しました."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "ギルド %sを作成しました."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "パーティ %sを作成しました."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "ギルド名"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "ギルド名を選んでください."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr "ギルド招待を承認したが既に入会しています."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%sがギルド %sへ招待しています."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "ギルド招待を受け入れる"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "パーティ招待を承認したが既に入会しています."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "パーティに招待されました."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "パーティ %sに招待されました."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%sはあなたをパーティに招待しました."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%sはあなたを%sというパーティに招待しました."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "パーティ招待を受け入れます"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "パーティーを作成することはできません。もうパーティーに入っています"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "パーティ名"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "パーティ名を選んでください."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7572,9 +7647,10 @@ msgstr "GP不足です."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "アイテムの追加に失敗しました。アイテム一種類を一つのウインドウ上で重複して追加することは出来ません."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"アイテムの追加に失敗しました。アイテム一種類を一つのウインドウ上で重複して追"
+"加することは出来ません."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -7659,25 +7735,25 @@ msgstr "世界の選択"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "キー_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr "ジョイスティックボタン%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr "不明なキー"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7685,7 +7761,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u キー"
 
@@ -8843,7 +8919,9 @@ msgstr "不明なキャラクターサーバーエラー."
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "キャラクター作成に失敗しました。既に使われている名前もしくは無効な文字が含まれています."
+msgstr ""
+"キャラクター作成に失敗しました。既に使われている名前もしくは無効な文字が含ま"
+"れています."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:160
@@ -9001,7 +9079,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "あなたは%sまでゲームから追放されました。\nGMにご連絡下さい."
+msgstr ""
+"あなたは%sまでゲームから追放されました。\n"
+"GMにご連絡下さい."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10571,30 +10651,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr ""
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -10605,11 +10685,6 @@ msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr ""
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr ""
@@ -10628,7 +10703,9 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"/%sへの可能なオプションは：\"yes\", \"no\", \"true\", \"false\", \"1\", "
+"\"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10684,3 +10761,30 @@ msgstr "%d秒"
 #, c-format
 msgid "%d seconds"
 msgstr "%d秒"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "ギルド名がありません."
+
+#~ msgid "Invite"
+#~ msgstr "招待"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "ギルド %sを作成しました."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "パーティ %sを作成しました."
+
+#~ msgid "Guild Name"
+#~ msgstr "ギルド名"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "ギルド名を選んでください."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "パーティーを作成することはできません。もうパーティーに入っています"
+
+#~ msgid "Party Name"
+#~ msgstr "パーティ名"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "パーティ名を選んでください."
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 601a19fa3..5a1f48849 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-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+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"
@@ -29,7 +29,6 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -49,10 +48,9 @@ msgstr ""
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -101,80 +99,83 @@ msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
 msgstr ""
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+msgid "Create party"
 msgstr ""
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+msgid "Create guild"
 msgstr ""
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr ""
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -448,8 +449,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr ""
 
@@ -533,8 +534,8 @@ msgstr ""
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -1236,7 +1237,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr ""
 
@@ -1421,8 +1422,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr ""
 
@@ -1728,8 +1729,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1748,58 +1749,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr ""
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr ""
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1821,7 +1770,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1835,8 +1784,8 @@ msgstr ""
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr ""
@@ -1847,36 +1796,36 @@ msgstr ""
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr ""
 
@@ -1884,7 +1833,7 @@ msgstr ""
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr ""
 
@@ -1901,9 +1850,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr ""
@@ -1912,7 +1861,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr ""
@@ -1927,7 +1876,7 @@ msgstr ""
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1945,7 +1894,7 @@ msgstr ""
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1957,26 +1906,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:320
+#: src/gui/popups/popupmenu.cpp:321
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr ""
 
@@ -1984,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:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr ""
 
@@ -2004,7 +1953,7 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr ""
 
@@ -2014,8 +1963,8 @@ msgstr ""
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr ""
@@ -2024,13 +1973,13 @@ msgstr ""
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr ""
 
@@ -2038,7 +1987,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2051,7 +2000,7 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr ""
 
@@ -2059,39 +2008,88 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr ""
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr ""
 
@@ -2101,28 +2099,28 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr ""
 
@@ -2131,7 +2129,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2139,69 +2137,68 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr ""
 
@@ -2211,116 +2208,116 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1745
+#: src/gui/popups/popupmenu.cpp:1762
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1767
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1771
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr ""
 
@@ -2329,8 +2326,8 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2338,63 +2335,63 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 msgid "Retrieve half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr ""
 
@@ -2405,17 +2402,17 @@ msgstr ""
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr ""
 
@@ -2424,43 +2421,43 @@ msgstr ""
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr ""
 
@@ -2468,175 +2465,244 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+msgid "Mouse position"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr ""
 
@@ -2644,38 +2710,38 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr ""
 
@@ -2684,7 +2750,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2693,7 +2759,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr ""
 
@@ -2702,7 +2768,7 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2711,31 +2777,31 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr ""
 
@@ -2743,7 +2809,7 @@ msgstr ""
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr ""
 
@@ -2751,109 +2817,109 @@ msgstr ""
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2861,31 +2927,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2894,19 +2960,19 @@ msgstr ""
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2918,8 +2984,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2927,63 +2993,80 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+msgid "Leave party"
+msgstr ""
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr ""
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+msgid "Self position"
+msgstr ""
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, c-format
+msgid "Cast type: %s"
+msgstr ""
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3518,6 +3601,11 @@ msgstr ""
 msgid "Party"
 msgstr ""
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr ""
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -4494,11 +4582,6 @@ msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr ""
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr ""
@@ -5783,70 +5866,70 @@ msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
@@ -5858,41 +5941,41 @@ msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
@@ -5904,17 +5987,17 @@ msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
@@ -6147,9 +6230,8 @@ msgstr ""
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
-#: src/gui/windows/charselectdialog.cpp:609 src/gui/windows/socialwindow.cpp:77
+#: src/gui/windows/charselectdialog.cpp:609
 msgid "Create"
 msgstr ""
 
@@ -6310,7 +6392,7 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr ""
 
@@ -6475,11 +6557,6 @@ msgid "Yes"
 msgstr ""
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr ""
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr ""
@@ -6581,7 +6658,7 @@ msgstr ""
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
 #: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
-#: src/resources/skill/skillinfo.cpp:118
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr ""
 
@@ -7285,173 +7362,138 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr ""
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr ""
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr ""
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr ""
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr ""
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr ""
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr ""
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr ""
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7677,25 +7719,25 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7703,7 +7745,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -10589,30 +10631,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr ""
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -10623,11 +10665,6 @@ msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr ""
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 01c89d562..41a798e61 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Elvano Miok <prd.studio@gmail.com>, 2012,2015
 # Jeroen De Meerleer <jeroen.de.meerleer@telenet.be>, 2011
@@ -11,14 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/language/nl_BE/)\n"
+"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
+"language/nl_BE/)\n"
+"Language: nl_BE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -32,7 +33,6 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -52,10 +52,9 @@ msgstr "Bestand is opgeladen"
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -104,80 +103,85 @@ msgid "Uploaded log into:"
 msgstr "Log opgeladen in:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
 msgstr "Kan geen fluistertab \"%s\" aanmaken. Deze bestaat waarschijnlijk al."
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Groepsnaam ontbreekt."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Groep aanmaken"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Guild-naam ontbreekt."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Aanmaken"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Gelieve een naam te specifiëren."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "Ga terug naar chat."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "Bericht sluit chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "Ga nu terug naar chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -451,8 +455,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -536,8 +540,8 @@ msgstr "Help"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -1239,16 +1243,17 @@ msgstr "Bericht"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven herstellen."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
+"herstellen."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
@@ -1264,8 +1269,7 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "standaard"
 
@@ -1426,8 +1430,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1733,8 +1737,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1753,58 +1757,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "Groep aanmaken"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "Annuleren"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1826,7 +1778,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1840,8 +1792,8 @@ msgstr "Handel"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "Aanvallen"
@@ -1852,36 +1804,36 @@ msgstr "Aanvallen"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "Fluister"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "Genees"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "Uit de gilde gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 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:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "Uitnodigen voor de gilde"
 
@@ -1889,7 +1841,7 @@ msgstr "Uitnodigen voor de gilde"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1906,9 +1858,9 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "Beweeg"
@@ -1917,7 +1869,7 @@ msgstr "Beweeg"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Spreken"
@@ -1932,7 +1884,7 @@ msgstr "Spreken"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1950,7 +1902,7 @@ msgstr "Kopen"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1962,26 +1914,26 @@ msgstr "Verkopen"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 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:320
+#: src/gui/popups/popupmenu.cpp:321
 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:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "Aan de aanvalslijst toevoegen"
 
@@ -1989,19 +1941,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:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr ""
 
@@ -2009,7 +1961,7 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr ""
 
@@ -2019,8 +1971,8 @@ msgstr ""
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "Hernoem"
@@ -2029,13 +1981,13 @@ msgstr "Hernoem"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr ""
 
@@ -2043,7 +1995,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2056,7 +2008,7 @@ msgstr "Afdoen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr ""
 
@@ -2064,39 +2016,88 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "Naam aan het gesprek toevoegen"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "Annuleren"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "Raap op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "Plaats voorwerp op de kaart"
 
@@ -2106,28 +2107,28 @@ 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:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "Verwijder"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr ""
 
@@ -2136,7 +2137,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2144,69 +2145,68 @@ msgstr "Kleren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spreuken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 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:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "Wissen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "Markering afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr "Markering aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "Verwijder naam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "away aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 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:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "Verlaat"
 
@@ -2216,116 +2216,116 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr "Speler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 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:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "Naam:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1745
+#: src/gui/popups/popupmenu.cpp:1762
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1767
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1771
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr ""
 
@@ -2334,8 +2334,8 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2343,63 +2343,63 @@ msgstr "Opslaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "Plaats 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "Plaats de helft"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Plaats alles"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "Afhalen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 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:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
@@ -2410,17 +2410,17 @@ msgstr "Haal alles op"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr ""
 
@@ -2429,43 +2429,43 @@ msgstr ""
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2473,175 +2473,245 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "Standaard"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr "Doel"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Automatische positieverbetering"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 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:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 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:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
@@ -2649,38 +2719,38 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr ""
 
@@ -2689,7 +2759,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2698,7 +2768,7 @@ msgstr "Inventaris"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr ""
 
@@ -2707,7 +2777,7 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2716,31 +2786,31 @@ msgstr "Winkelkar"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Commando's"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr ""
 
@@ -2748,7 +2818,7 @@ msgstr ""
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr "Ga naar"
 
@@ -2756,109 +2826,109 @@ msgstr "Ga naar"
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2866,31 +2936,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr "Schop"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2899,19 +2969,19 @@ msgstr ""
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2923,8 +2993,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2932,63 +3002,82 @@ msgstr "Info"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "Verlaten Groep?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr ""
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Automatische positieverbetering"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "Groep: %s"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3523,6 +3612,11 @@ msgstr "Taal"
 msgid "Party"
 msgstr "Groep"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Groepsnaam ontbreekt."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3531,15 +3625,13 @@ msgstr "Voorwerpdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Voorwerpdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Voorwerpdeling is niet mogelijk."
 
@@ -3550,22 +3642,19 @@ msgstr "Voorwerpdeling onbekend."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Ervaringsdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Ervaringsdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Ervaringsdeling is niet mogelijk."
 
@@ -4006,15 +4095,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Kleuren"
 
@@ -4038,9 +4127,11 @@ msgstr "Toon chat kleurenlijst"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4067,9 +4158,11 @@ msgstr "Limiteer max karakters in chat lijn"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4080,7 +4173,9 @@ msgstr "Limiteer max lijnen in chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4121,8 +4216,8 @@ msgstr "Toon chat geschiedenis"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4133,9 +4228,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4146,9 +4243,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4164,9 +4263,13 @@ msgstr "Verberg verkoop boodschappen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4179,7 +4282,8 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4198,9 +4302,12 @@ msgstr "Plaats alle persoonlijke berichten in tabs"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4211,7 +4318,8 @@ msgstr "Hou magie berichten bij in de 'Debug' tab"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4224,9 +4332,11 @@ msgstr "Toon server berichten in de debug tab"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4251,9 +4361,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4264,7 +4376,8 @@ msgstr "Taal tab aanzetten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4277,7 +4390,9 @@ msgstr "Toon alle taal berichten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4290,7 +4405,9 @@ msgstr "Schakel de gevechtstab in"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4316,7 +4433,10 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4351,7 +4471,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4364,7 +4485,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4377,9 +4499,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4468,11 +4593,6 @@ msgid "Unassign"
 msgstr "Maak toewijzing ongedaan"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "Standaard"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr ""
@@ -5541,13 +5661,17 @@ msgstr "Geen"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Gefaald om te wisselen naar venstermodus en terugkeren naar oude modus faalde ook!"
+msgstr ""
+"Gefaald om te wisselen naar venstermodus en terugkeren naar oude modus "
+"faalde ook!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Gefaald om te wisselen naar volledigscherm modus en terugkeren naar oude modus faalde ook!"
+msgstr ""
+"Gefaald om te wisselen naar volledigscherm modus en terugkeren naar oude "
+"modus faalde ook!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5588,7 +5712,9 @@ msgstr "Scherm Resolutie is gewijzigd"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte resolutie."
+msgstr ""
+"Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
+"resolutie."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -5757,70 +5883,70 @@ msgid "Atk"
 msgstr "Aanv"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "gebruiker %s uitgenodigd in guild %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Guild %s verlating aangevraagd."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "Lid uitnodigen bij gilde"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Wie zou u willen uitnodigen in guild %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "Verlaten Guild?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bent u zeker dat u guild %s wilt verlaten?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
@@ -5832,41 +5958,41 @@ msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Gebruiker %s uitgenodigd in groep."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Groep %s stoppen verzocht."
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "Lid uitnodigen in groep"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Wie zou u willen uitnodigen in group %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "Verlaten Groep?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Bent u zeker dat u groep %s wilt verlaten?"
@@ -5878,17 +6004,17 @@ msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr "Raap dingen op"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
@@ -6121,10 +6247,8 @@ msgstr ""
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -6241,8 +6365,7 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6260,8 +6383,7 @@ msgstr "Nog %d punten te verdelen"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6287,8 +6409,7 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr "F"
 
@@ -6453,11 +6574,6 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr "Doel"
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr "Net"
@@ -6489,8 +6605,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -6559,8 +6674,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -6856,15 +6971,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7266,173 +7379,138 @@ msgid "Up"
 msgstr "Omhoog"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Vaardigheidspunten vrijgegeven: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr "Vaardigheid Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "Vaardigheid %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niv: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr "S"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "Nodig uit"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Uitnodiging voor groep %s aanvaard."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Uitnodiging voor groep %s geweigerd."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Uitnodiging voor guild %s aanvaard."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Uitnodiging voor guild %s geweigerd."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Maken van guild %s."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "Maken van groep %s."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "Guild Naam"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "Kies uw guild naam."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s heeft je uitgenodigd om guid %s te vervoegen."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "Guild Uitnodiging Aanvaarden"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "U bent uitgenodigd om je bij een groep te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "U bent uitgenodigd om je bij groep %s te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "Kan groep niet aanmaken. Je bent al in een groep."
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "Groep Naam"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "Kies uw groepsnaam."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7572,9 +7650,10 @@ msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in het venster."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
+"het venster."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -7659,25 +7738,25 @@ msgstr "Kies Wereld"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7685,7 +7764,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u key"
 
@@ -8828,7 +8907,9 @@ msgstr ""
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr "Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze server."
+msgstr ""
+"Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze "
+"server."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:55
@@ -9001,7 +9082,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Je bent tijdelijk geband van het spel tot %s.\nNeem aub contact op met het GM team via de forums."
+msgstr ""
+"Je bent tijdelijk geband van het spel tot %s.\n"
+"Neem aub contact op met het GM team via de forums."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -9926,7 +10009,8 @@ msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:295
 msgid "Failed adding item. You can't trade this item."
-msgstr "Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen."
+msgstr ""
+"Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:299
@@ -10571,30 +10655,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr ""
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -10605,11 +10689,6 @@ msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr ""
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr ""
@@ -10628,7 +10707,8 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10684,3 +10764,30 @@ msgstr "%d seconden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Guild-naam ontbreekt."
+
+#~ msgid "Invite"
+#~ msgstr "Nodig uit"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "Maken van guild %s."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "Maken van groep %s."
+
+#~ msgid "Guild Name"
+#~ msgstr "Guild Naam"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "Kies uw guild naam."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "Kan groep niet aanmaken. Je bent al in een groep."
+
+#~ msgid "Party Name"
+#~ msgstr "Groep Naam"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "Kies uw groepsnaam."
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 01c89d562..41a798e61 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Elvano Miok <prd.studio@gmail.com>, 2012,2015
 # Jeroen De Meerleer <jeroen.de.meerleer@telenet.be>, 2011
@@ -11,14 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/language/nl_BE/)\n"
+"Language-Team: Dutch (Belgium) (http://www.transifex.com/akaras/manaplus/"
+"language/nl_BE/)\n"
+"Language: nl_BE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -32,7 +33,6 @@ msgstr "Bestand is opgeladen"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -52,10 +52,9 @@ msgstr "Bestand is opgeladen"
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -104,80 +103,85 @@ msgid "Uploaded log into:"
 msgstr "Log opgeladen in:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
 msgstr "Kan geen fluistertab \"%s\" aanmaken. Deze bestaat waarschijnlijk al."
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Groepsnaam ontbreekt."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Groep aanmaken"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Guild-naam ontbreekt."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Aanmaken"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Gelieve een naam te specifiëren."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "Ga terug naar chat."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "Bericht sluit chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "Ga nu terug naar chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "Bericht sluit nu chat."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -451,8 +455,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "Volledig genegeerd"
 
@@ -536,8 +540,8 @@ msgstr "Help"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -1239,16 +1243,17 @@ msgstr "Bericht"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven herstellen."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven "
+"herstellen."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
@@ -1264,8 +1269,7 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "standaard"
 
@@ -1426,8 +1430,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(standaard)"
 
@@ -1733,8 +1737,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1753,58 +1757,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "Groep aanmaken"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "Annuleren"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1826,7 +1778,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1840,8 +1792,8 @@ msgstr "Handel"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "Aanvallen"
@@ -1852,36 +1804,36 @@ msgstr "Aanvallen"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "Fluister"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "Genees"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "Uit de gilde gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 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:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "Uitnodigen voor de gilde"
 
@@ -1889,7 +1841,7 @@ msgstr "Uitnodigen voor de gilde"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1906,9 +1858,9 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "Beweeg"
@@ -1917,7 +1869,7 @@ msgstr "Beweeg"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Spreken"
@@ -1932,7 +1884,7 @@ msgstr "Spreken"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1950,7 +1902,7 @@ msgstr "Kopen"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1962,26 +1914,26 @@ msgstr "Verkopen"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 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:320
+#: src/gui/popups/popupmenu.cpp:321
 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:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "Aan de aanvalslijst toevoegen"
 
@@ -1989,19 +1941,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:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 msgid "Add to ignore list"
 msgstr "an de negeerlijst toevoegen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr ""
 
@@ -2009,7 +1961,7 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr ""
 
@@ -2019,8 +1971,8 @@ msgstr ""
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "Hernoem"
@@ -2029,13 +1981,13 @@ msgstr "Hernoem"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr ""
 
@@ -2043,7 +1995,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2056,7 +2008,7 @@ msgstr "Afdoen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr ""
 
@@ -2064,39 +2016,88 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "Naam aan het gesprek toevoegen"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "Annuleren"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Spelers"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Uit de groep gooien"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "Raap op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Aan chat toevoegen"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "Plaats voorwerp op de kaart"
 
@@ -2106,28 +2107,28 @@ 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:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "Verwijder"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr ""
 
@@ -2136,7 +2137,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2144,69 +2145,68 @@ msgstr "Kleren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spreuken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 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:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "Wissen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "Markering afzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr "Markering aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "Verwijder naam"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "away aanzetten"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 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:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "Verlaat"
 
@@ -2216,116 +2216,116 @@ msgstr "Verlaat"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "Wijzig uw guild positie"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr "Speler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 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:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "Naam:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1745
+#: src/gui/popups/popupmenu.cpp:1762
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1767
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1771
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr ""
 
@@ -2334,8 +2334,8 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2343,63 +2343,63 @@ msgstr "Opslaan"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "Plaats 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "Plaats de helft"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Plaats alles"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "Afhalen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "Haal 10 op"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 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:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Haal alles op"
 
@@ -2410,17 +2410,17 @@ msgstr "Haal alles op"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Gebruiken"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr ""
 
@@ -2429,43 +2429,43 @@ msgstr ""
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "Verberg"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "Toon"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr "Kopieer naar chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "Beweeg naar boven"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr "Beweeg naar beneden"
 
@@ -2473,175 +2473,245 @@ msgstr "Beweeg naar beneden"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr "ontkleed"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr "Kopiëren"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr "Plakken"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "Standaard"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr "Doel"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Automatische positieverbetering"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 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:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 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:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr "Wis"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "Word vriend"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "Stop Negeren"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "Volg"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "Koop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "Verkoop (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "uitnodigen voor de groep"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "Toon Voorwerpen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Neerleggen..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "Laat alles vallen"
 
@@ -2649,38 +2719,38 @@ msgstr "Laat alles vallen"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Neerleggen"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr ""
 
@@ -2689,7 +2759,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2698,7 +2768,7 @@ msgstr "Inventaris"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr ""
 
@@ -2707,7 +2777,7 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2716,31 +2786,31 @@ msgstr "Winkelkar"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Commando's"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr ""
 
@@ -2748,7 +2818,7 @@ msgstr ""
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr "Ga naar"
 
@@ -2756,109 +2826,109 @@ msgstr "Ga naar"
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2866,31 +2936,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr "Schop"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2899,19 +2969,19 @@ msgstr ""
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2923,8 +2993,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2932,63 +3002,82 @@ msgstr "Info"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "Verlaten Groep?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr ""
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Automatische positieverbetering"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "Groep: %s"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3523,6 +3612,11 @@ msgstr "Taal"
 msgid "Party"
 msgstr "Groep"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Groepsnaam ontbreekt."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3531,15 +3625,13 @@ msgstr "Voorwerpdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Voorwerpdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Voorwerpdeling is niet mogelijk."
 
@@ -3550,22 +3642,19 @@ msgstr "Voorwerpdeling onbekend."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Ervaringsdeling ingeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Ervaringsdeling uitgeschakeld."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Ervaringsdeling is niet mogelijk."
 
@@ -4006,15 +4095,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Kleuren"
 
@@ -4038,9 +4127,11 @@ msgstr "Toon chat kleurenlijst"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4067,9 +4158,11 @@ msgstr "Limiteer max karakters in chat lijn"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4080,7 +4173,9 @@ msgstr "Limiteer max lijnen in chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4121,8 +4216,8 @@ msgstr "Toon chat geschiedenis"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4133,9 +4228,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4146,9 +4243,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4164,9 +4263,13 @@ msgstr "Verberg verkoop boodschappen"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4179,7 +4282,8 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4198,9 +4302,12 @@ msgstr "Plaats alle persoonlijke berichten in tabs"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4211,7 +4318,8 @@ msgstr "Hou magie berichten bij in de 'Debug' tab"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4224,9 +4332,11 @@ msgstr "Toon server berichten in de debug tab"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4251,9 +4361,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4264,7 +4376,8 @@ msgstr "Taal tab aanzetten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4277,7 +4390,9 @@ msgstr "Toon alle taal berichten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4290,7 +4405,9 @@ msgstr "Schakel de gevechtstab in"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4316,7 +4433,10 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4351,7 +4471,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4364,7 +4485,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4377,9 +4499,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4468,11 +4593,6 @@ msgid "Unassign"
 msgstr "Maak toewijzing ongedaan"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "Standaard"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr ""
@@ -5541,13 +5661,17 @@ msgstr "Geen"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Gefaald om te wisselen naar venstermodus en terugkeren naar oude modus faalde ook!"
+msgstr ""
+"Gefaald om te wisselen naar venstermodus en terugkeren naar oude modus "
+"faalde ook!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Gefaald om te wisselen naar volledigscherm modus en terugkeren naar oude modus faalde ook!"
+msgstr ""
+"Gefaald om te wisselen naar volledigscherm modus en terugkeren naar oude "
+"modus faalde ook!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5588,7 +5712,9 @@ msgstr "Scherm Resolutie is gewijzigd"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte resolutie."
+msgstr ""
+"Enkele vensters kunnen verplaatst worden om te passen in de omlaag gebrachte "
+"resolutie."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -5757,70 +5883,70 @@ msgid "Atk"
 msgstr "Aanv"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "gebruiker %s uitgenodigd in guild %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Guild %s verlating aangevraagd."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "Lid uitnodigen bij gilde"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Wie zou u willen uitnodigen in guild %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "Verlaten Guild?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Bent u zeker dat u guild %s wilt verlaten?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
@@ -5832,41 +5958,41 @@ msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Gebruiker %s uitgenodigd in groep."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Groep %s stoppen verzocht."
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "Lid uitnodigen in groep"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Wie zou u willen uitnodigen in group %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "Verlaten Groep?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Bent u zeker dat u groep %s wilt verlaten?"
@@ -5878,17 +6004,17 @@ msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr "Raap dingen op"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
@@ -6121,10 +6247,8 @@ msgstr ""
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Aanmaken"
 
@@ -6241,8 +6365,7 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6260,8 +6383,7 @@ msgstr "Nog %d punten te verdelen"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6287,8 +6409,7 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr "F"
 
@@ -6453,11 +6574,6 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr "Doel"
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr "Net"
@@ -6489,8 +6605,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Verbinden"
 
@@ -6559,8 +6674,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -6856,15 +6971,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7266,173 +7379,138 @@ msgid "Up"
 msgstr "Omhoog"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Vaardigheidspunten vrijgegeven: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr "Vaardigheid Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "Vaardigheid %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Niv: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr "S"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "Nodig uit"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Uitnodiging voor groep %s aanvaard."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Uitnodiging voor groep %s geweigerd."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Uitnodiging voor guild %s aanvaard."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Uitnodiging voor guild %s geweigerd."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Maken van guild %s."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "Maken van groep %s."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "Guild Naam"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "Kies uw guild naam."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s heeft je uitgenodigd om guid %s te vervoegen."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "Guild Uitnodiging Aanvaarden"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "U bent uitgenodigd om je bij een groep te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "U bent uitgenodigd om je bij groep %s te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "Groepsuitnodiging aanvaarden"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "Kan groep niet aanmaken. Je bent al in een groep."
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "Groep Naam"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "Kies uw groepsnaam."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7572,9 +7650,10 @@ msgstr "Je hebt niet genoeg geld."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in het venster."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
+"het venster."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -7659,25 +7738,25 @@ msgstr "Kies Wereld"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7685,7 +7764,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u key"
 
@@ -8828,7 +8907,9 @@ msgstr ""
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr "Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze server."
+msgstr ""
+"Toegang geweigerd. Hoogstwaarschijnlijk zijn er teveel spelers op deze "
+"server."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:55
@@ -9001,7 +9082,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Je bent tijdelijk geband van het spel tot %s.\nNeem aub contact op met het GM team via de forums."
+msgstr ""
+"Je bent tijdelijk geband van het spel tot %s.\n"
+"Neem aub contact op met het GM team via de forums."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -9926,7 +10009,8 @@ msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:295
 msgid "Failed adding item. You can't trade this item."
-msgstr "Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen."
+msgstr ""
+"Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:299
@@ -10571,30 +10655,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr ""
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -10605,11 +10689,6 @@ msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr ""
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr ""
@@ -10628,7 +10707,8 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10684,3 +10764,30 @@ msgstr "%d seconden"
 #, c-format
 msgid "%d seconds"
 msgstr "%d seconden"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Guild-naam ontbreekt."
+
+#~ msgid "Invite"
+#~ msgstr "Nodig uit"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "Maken van guild %s."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "Maken van groep %s."
+
+#~ msgid "Guild Name"
+#~ msgstr "Guild Naam"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "Kies uw guild naam."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "Kan groep niet aanmaken. Je bent al in een groep."
+
+#~ msgid "Party Name"
+#~ msgstr "Groep Naam"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "Kies uw groepsnaam."
diff --git a/po/pl.po b/po/pl.po
index 70bead115..be7f196b2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Avenn <avenn3@gmail.com>, 2013-2014
@@ -14,15 +14,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/akaras/manaplus/language/"
+"pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
 #: src/actions/actions.cpp:164
@@ -35,7 +37,6 @@ msgstr "Plik wysłano"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -55,10 +56,9 @@ msgstr "Plik wysłano"
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -107,80 +107,85 @@ msgid "Uploaded log into:"
 msgstr "Załaduj log do:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
 msgstr ""
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Brakuje nazwy grupy."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Utwórz grupę"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Brak nazwy gildii."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Gildia celu:"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Proszę wpisać prawidłową nazwę."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "Return włącza czat."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "Wiadomość zamyka czat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "Return od teraz włącza czat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "Wiadomość od teraz zamyka czat."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -455,8 +460,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "Całkowicie ignoruj"
 
@@ -540,8 +545,8 @@ msgstr "Pomoc"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -1243,21 +1248,23 @@ msgstr "Wiadomość"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr "Wskrześ"
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Niesiesz więcej niż połowę dopuszczalnego ciężaru. Nie odzyskujesz zdrowia."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Niesiesz więcej niż połowę dopuszczalnego ciężaru. Nie odzyskujesz zdrowia."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Niesiesz mniej niż połowę dopuszczalnego ciężaru. Możesz znowu odzyskiwać zdrowie."
+msgstr ""
+"Niesiesz mniej niż połowę dopuszczalnego ciężaru. Możesz znowu odzyskiwać "
+"zdrowie."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1268,8 +1275,7 @@ msgstr "Niesiesz mniej niż połowę dopuszczalnego ciężaru. Możesz znowu odz
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "domyślnie"
 
@@ -1430,8 +1436,8 @@ msgstr "Ogromna (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(domyślne)"
 
@@ -1737,8 +1743,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1757,58 +1763,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "Utwórz grupę"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "Anuluj"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1830,7 +1784,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1844,8 +1798,8 @@ msgstr "Handel"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "Atak"
@@ -1856,36 +1810,36 @@ msgstr "Atak"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "Szept"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "Lecz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "Wyrzuć z gildii"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 msgid "Change pos in guild"
 msgstr "Zmień pozycję w gildii"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "Zaproś do gildii"
 
@@ -1893,7 +1847,7 @@ msgstr "Zaproś do gildii"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "Wysadź w powietrze"
 
@@ -1910,9 +1864,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:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "Podejdź"
@@ -1921,7 +1875,7 @@ msgstr "Podejdź"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Rozmowa"
@@ -1936,7 +1890,7 @@ msgstr "Rozmowa"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1954,7 +1908,7 @@ msgstr "Kup"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1966,26 +1920,26 @@ msgstr "Sprzedaj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr "Dodaj komentarz"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 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:320
+#: src/gui/popups/popupmenu.cpp:321
 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:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "Dodaj do listy atakowanych"
 
@@ -1993,19 +1947,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:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 msgid "Add to ignore list"
 msgstr "Dodaj do listy ignorowanych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr ""
 
@@ -2013,7 +1967,7 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr ""
 
@@ -2023,8 +1977,8 @@ msgstr ""
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "Zmień nazwę"
@@ -2033,13 +1987,13 @@ msgstr "Zmień nazwę"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr ""
 
@@ -2047,7 +2001,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2060,7 +2014,7 @@ msgstr "Zdejmij"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr ""
 
@@ -2068,39 +2022,88 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "Wpisz do czatu"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "Anuluj"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Gracze"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Wyrzuć z grupy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "Podnieś"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Dodaj do czatu"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "Portal"
 
@@ -2110,28 +2113,28 @@ msgstr "Portal"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "Usuń"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr "Teleport"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr "Przesuwaj kamerę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr ""
 
@@ -2140,7 +2143,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2148,69 +2151,68 @@ msgstr "Stroje"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr "Usuń ubiór"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Zaklęcia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 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:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "Wyczyść"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "Wyłącz alarm"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 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:852
+#: src/gui/popups/popupmenu.cpp:869
 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:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "Usuń imię"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "Włącz tryb AFK"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 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:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "Opuść"
 
@@ -2220,116 +2222,116 @@ msgstr "Opuść"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr "Skopiuj do schowka"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "Zmień pozycję gildii"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr "okno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr "odblokuj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr "zablokuj"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr "Gracze"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 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:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "Nick:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr "Komentarz gracza          "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr "Komentarz:                    "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 msgid "Add to trade"
 msgstr "Dodaj do handlu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1745
+#: src/gui/popups/popupmenu.cpp:1762
 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:1750
+#: src/gui/popups/popupmenu.cpp:1767
 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:1754
+#: src/gui/popups/popupmenu.cpp:1771
 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:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr "Dodaj wszystko do handlu"
 
@@ -2338,8 +2340,8 @@ msgstr "Dodaj wszystko do handlu"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2347,63 +2349,63 @@ msgstr "Podaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "Podaj 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "Podaj połowę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr "Podaj wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Podaj wszystko"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "Pobierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "Pobierz 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 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:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr "Pobierz wszystko-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Pobierz wszystko"
 
@@ -2414,17 +2416,17 @@ msgstr "Pobierz wszystko"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Użyj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr "Wyczyść okno upuszczeń."
 
@@ -2433,43 +2435,43 @@ msgstr "Wyczyść okno upuszczeń."
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "Ukryj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "Pokaż"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 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:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr "Skopiuj do czatu"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "W górę"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr "W dół"
 
@@ -2477,175 +2479,245 @@ msgstr "W dół"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr "Rozbierz"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr "Kopiuj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr "Wklej"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr "Otwórz adres internetowy"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr "Pokaż okno"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "Domyślne"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr "Cel"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Koryguj pozycję automatycznie"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 msgid "Disregard"
 msgstr "Lekceważ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 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:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr "Czarna lista"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr "Ustaw jako wroga"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr "Usuń"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "Dodaj do znajomych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "Odignoruj"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "Podążaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "Kup (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "Sprzedaj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "Zaproś do grupy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "Pokaż przedmioty"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr "Usuń z listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Add to pickup list"
 msgstr "Dodaj do listy podnoszonych"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr "Przestań chronić przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr "Chroń przedmiot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Upuść..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "Upuść wszystko"
 
@@ -2653,38 +2725,38 @@ msgstr "Upuść wszystko"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Upuść"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr ""
 
@@ -2693,7 +2765,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2702,7 +2774,7 @@ msgstr "Inwentarz"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr "Magazyn"
 
@@ -2711,7 +2783,7 @@ msgstr "Magazyn"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2720,31 +2792,31 @@ msgstr "Wózek"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Polecenia"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr "Sprawdź IP"
 
@@ -2752,7 +2824,7 @@ msgstr "Sprawdź IP"
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr "Idź do"
 
@@ -2760,109 +2832,109 @@ msgstr "Idź do"
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr "Przywołaj"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2870,31 +2942,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr "Wyrzuć"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2903,19 +2975,19 @@ msgstr ""
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2927,8 +2999,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2936,63 +3008,82 @@ msgstr "Info"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr "Polecenia GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "Opuścić grupę?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr ""
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Koryguj pozycję automatycznie"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "Rodzaj celu:"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3527,6 +3618,11 @@ msgstr "Język"
 msgid "Party"
 msgstr "Grupa"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Brakuje nazwy grupy."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3535,15 +3631,13 @@ msgstr "Włączono dzielenie się przedmiotami."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Wyłączono dzielenie się przedmiotami."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Nie można włączyć dzielenia się przedmiotami."
 
@@ -3554,24 +3648,23 @@ msgstr "Stan dzielenia się przedmiotami nieznany."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Podział doświadczenia włączony."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Podział doświadczenia wyłączony."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
-msgstr "Podział doświadczenia nie jest możliwy- prawdopodobnie maksymalna róznica poziomów jest większa niż 10."
+msgstr ""
+"Podział doświadczenia nie jest możliwy- prawdopodobnie maksymalna róznica "
+"poziomów jest większa niż 10."
 
 #. TRANSLATORS: chat message
 #: src/gui/widgets/tabs/chat/partytab.cpp:165
@@ -4010,15 +4103,15 @@ msgstr "Podtrzymuj skupienie na pasek czatu."
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Kolory"
 
@@ -4042,9 +4135,11 @@ msgstr "Pokazuj listę kolorów czatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4071,9 +4166,11 @@ msgstr "Limit znaków w wierszu czatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4084,7 +4181,9 @@ msgstr "Limit wierszy w czacie"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4125,8 +4224,8 @@ msgstr "Pokazuj historię czatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4137,9 +4236,11 @@ msgstr "Pokazuj wiadomości online drużyny"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4150,9 +4251,11 @@ msgstr "Pokazuj wiadomości online gildii"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4168,9 +4271,13 @@ msgstr "Ukryj wiadomości od sklepów"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4183,7 +4290,8 @@ msgstr "Pokazuj wiadomości MVP"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4202,9 +4310,12 @@ msgstr "Umieść wszystkie szepty w zakładkach"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4215,7 +4326,8 @@ msgstr "Loguj powiadomienia o magii w zakładce Debug"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4228,9 +4340,11 @@ msgstr "Pokazuj wiadomości serwera w zakładce Debug"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4255,9 +4369,11 @@ msgstr "Aktywuj zakładkę GM"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4268,7 +4384,8 @@ msgstr "Aktywuj zakładkę \"języki\""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4281,7 +4398,9 @@ msgstr "Pokaż wiadomości ze wszystkich języków"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4294,7 +4413,9 @@ msgstr "Włącz zakładkę bitewną"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4320,7 +4441,10 @@ msgstr "Jeśli potrzeba, zmień rozmiar zakładek czatu"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4355,7 +4479,8 @@ msgstr "Podświetlaj słowa (oddzielaj przecinkiem)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4368,7 +4493,8 @@ msgstr "Ignoruj imienia globalnie (oddzielone przecinkiem)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4381,9 +4507,12 @@ msgstr "Pokazuj przycisk emotek w czacie"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4472,11 +4601,6 @@ msgid "Unassign"
 msgstr "Odznacz"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "Domyślne"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Zresetuj wszystkie klawisze"
@@ -4497,7 +4621,9 @@ msgstr "Wykryto konflikt klawiszy."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Konflikt pomiędzy klawiszami \"%s\" i \"%s\". Rozwiąż go, albo mogą pojawić się problemy."
+msgstr ""
+"Konflikt pomiędzy klawiszami \"%s\" i \"%s\". Rozwiąż go, albo mogą pojawić "
+"się problemy."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5266,7 +5392,9 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_players.cpp:143
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
-msgstr "Emuluj prawy przycisk myszki poprzez długie wciśnięcie lewego przycisku (przydatne dla ekranów dotykowych)"
+msgstr ""
+"Emuluj prawy przycisk myszki poprzez długie wciśnięcie lewego przycisku "
+"(przydatne dla ekranów dotykowych)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:148
@@ -5545,13 +5673,16 @@ msgstr "Brak"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Nie udało się zmienić na tryb w oknie, ani przywrócić do poprzedniego stanu!"
+msgstr ""
+"Nie udało się zmienić na tryb w oknie, ani przywrócić do poprzedniego stanu!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Nie udało się zmienić na tryb pełnoekranowy ani przywrócić do poprzedniego stanu!"
+msgstr ""
+"Nie udało się zmienić na tryb pełnoekranowy ani przywrócić do poprzedniego "
+"stanu!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5592,7 +5723,9 @@ msgstr "Rozdzielczość zmieniona"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Niektóre okna mogą być przesunięte aby dopasować się do niższej rozdzielczości."
+msgstr ""
+"Niektóre okna mogą być przesunięte aby dopasować się do niższej "
+"rozdzielczości."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -5761,70 +5894,70 @@ msgid "Atk"
 msgstr "Atk"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr "Priorytetowe moby"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr "Atakuj moby"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr "Ignoruj moby"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr "Przyjaciele: %u/%u"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr "Gracze: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Zaproszono gracza %s do gildii %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Poproszono o wyjście z gildii %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "Zaproszenie do gildii"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Kogo chcesz zaprosić do gildii %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "Opuścić gildię?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Na pewno opuścić gildię %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr "Członkowie: %u/%u"
@@ -5836,41 +5969,41 @@ msgid "Nav"
 msgstr "GPS"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr "Portale: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Gracz %s zaproszony do grupy."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Poproszono o wyjście z grupy %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "Zaproszenie do grupy"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Kogo chcesz zaprosić do grupy %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "Opuścić grupę?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Na pewno opuścić grupę %s?"
@@ -5882,17 +6015,17 @@ msgid "Pik"
 msgstr "Pod"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr "Podnoś przedmioty"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr "Ignoruj przedmioty"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr "Widoczni gracze: %d"
@@ -6125,10 +6258,8 @@ msgstr "Ilość:"
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Utwórz"
 
@@ -6245,8 +6376,7 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6264,8 +6394,7 @@ msgstr "Proszę wykorzystać %d punktów"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6291,8 +6420,7 @@ msgstr "Wygląd:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr "F"
 
@@ -6391,7 +6519,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "PŻ: %u/%u\nPM: %u/%u\nPoziom: %u\nDoświadczenie: %u\nPieniądze: %s"
+msgstr ""
+"PŻ: %u/%u\n"
+"PM: %u/%u\n"
+"Poziom: %u\n"
+"Doświadczenie: %u\n"
+"Pieniądze: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6457,11 +6590,6 @@ msgid "Yes"
 msgstr "Tak"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr "Cel"
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr "Sieć"
@@ -6493,8 +6621,7 @@ msgstr "Edytuj serwer"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Połącz"
 
@@ -6563,8 +6690,8 @@ msgstr "Czcionki"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr "nieznane"
 
@@ -6862,15 +6989,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7272,173 +7397,138 @@ msgid "Up"
 msgstr "Podwyż"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, 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:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr "Zestaw umiejętności %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "Umiejętność %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Poziom: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr "V"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "Zaproś"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Zaakceptowano zaproszenie do grupy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odrzucono zaproszenie do grupy od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Akceptowano zaproszenie do gildii od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odrzucono zaproszenie do gildii od %s."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Tworzenie gildii o nazwie %s."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "Tworzenie grupy o nazwie %s."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "Nazwa gildii"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "Wybierz nazwę gildii."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr "Gildia o tej nazwie już istnieje."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s zaprosił/a Cię do gildii %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "Akceptuj zaproszenie do gildii"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "Grupa o takiej nazwie już istnieje."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "Zostałeś/aś zaproszony/a do grupy."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Zostałeś/aś zaproszony/a do grupy %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s zaprosił/a Cię do grupy."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s zaprosił/a Cię do grupy %s ."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "Zaakceptuj zaproszenie do grupy"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "Nie można utworzyć grupy. Już należysz do grupy."
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "Nazwa grupy"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "Wybierz nazwę grupy."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7578,9 +7668,10 @@ msgstr "Nie masz wystarczającej ilości pieniędzy."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam rodzaj przedmiotu w okienku."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Dodanie przedmiotu nie powiodło się. Nie może zachodzić na siebie ten sam "
+"rodzaj przedmiotu w okienku."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -7665,25 +7756,25 @@ msgstr "Wybierz świat"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr "nieznany klawisz"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7691,7 +7782,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "(nieznany)"
 
@@ -9007,7 +9098,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Dostałeś/aś tymczasowego bana do %s.\nProsimy o kontakt z drużyną GM-ów przez fora."
+msgstr ""
+"Dostałeś/aś tymczasowego bana do %s.\n"
+"Prosimy o kontakt z drużyną GM-ów przez fora."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -9888,7 +9981,9 @@ msgstr "Dodaj amunicję do ekwipunku."
 #: src/resources/notifications.h:262
 #, c-format
 msgid "Trading with %s isn't possible. Trade partner is too far away."
-msgstr "Handlowania z %s nie jest możliwe. Postać z którą handlujesz jest zbyt daleko."
+msgstr ""
+"Handlowania z %s nie jest możliwe. Postać z którą handlujesz jest zbyt "
+"daleko."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:267
@@ -9927,7 +10022,9 @@ msgstr "Nie można dodać przedmiotu. Osoba z którą handlujesz jest przeciąż
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:291
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Nie można dodać przedmiotu. Osoba z którą handlujesz nie ma wolnych miejsc w inwentarzu."
+msgstr ""
+"Nie można dodać przedmiotu. Osoba z którą handlujesz nie ma wolnych miejsc w "
+"inwentarzu."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:295
@@ -10577,30 +10674,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr ""
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -10611,11 +10708,6 @@ msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr ""
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr ""
@@ -10690,3 +10782,30 @@ msgstr "%d sekund/y"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekund/y"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Brak nazwy gildii."
+
+#~ msgid "Invite"
+#~ msgstr "Zaproś"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "Tworzenie gildii o nazwie %s."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "Tworzenie grupy o nazwie %s."
+
+#~ msgid "Guild Name"
+#~ msgstr "Nazwa gildii"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "Wybierz nazwę gildii."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "Nie można utworzyć grupy. Już należysz do grupy."
+
+#~ msgid "Party Name"
+#~ msgstr "Nazwa grupy"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "Wybierz nazwę grupy."
diff --git a/po/pt.po b/po/pt.po
index d67f9ceff..4a49c35cd 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # freya <freya.df@gmail.com>, 2013
@@ -13,14 +13,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/pt/)\n"
+"Language-Team: Portuguese (http://www.transifex.com/akaras/manaplus/language/"
+"pt/)\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -34,7 +35,6 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -54,10 +54,9 @@ msgstr ""
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -106,80 +105,85 @@ msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
 msgstr ""
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Falta o nome do grupo."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Criar grupo"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Falta o nome da guilda."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Guilda de alvo:"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -453,8 +457,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -538,8 +542,8 @@ msgstr "Ajuda"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -716,7 +720,9 @@ msgstr "  -H --update-host : Usar este host de update"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Escolhe um personagem e um servidor de personagem padrão"
+msgstr ""
+"  -D --default        : Escolhe um personagem e um servidor de personagem "
+"padrão"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:93
@@ -726,12 +732,14 @@ msgstr "  -u --skip-update    : Não faz downloads de atualização"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
+msgstr ""
+"  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
+msgstr ""
+"  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:103
@@ -751,7 +759,8 @@ msgstr ""
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --testes          : Começar a testar drivers para auto configuração"
+msgstr ""
+"  -T --testes          : Começar a testar drivers para auto configuração"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -1241,21 +1250,24 @@ msgstr "Mensagem"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Você está carregando mais que a metade de seu peso. Você não poderá mais recuperar HP."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Você está carregando mais que a metade de seu peso. Você não poderá mais "
+"recuperar HP."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Você está carregando menos da metade de seu peso. Você vai recuperar-se novamente."
+msgstr ""
+"Você está carregando menos da metade de seu peso. Você vai recuperar-se "
+"novamente."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1266,8 +1278,7 @@ msgstr "Você está carregando menos da metade de seu peso. Você vai recuperar-
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "padrão"
 
@@ -1428,8 +1439,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1735,8 +1746,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1755,58 +1766,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "Criar grupo"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "Cancelar"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1828,7 +1787,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1842,8 +1801,8 @@ msgstr "Negócios"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "Ataque"
@@ -1854,36 +1813,36 @@ msgstr "Ataque"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "Sussuro"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "Curar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "Chutar da Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 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:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "Convidar para Guilda"
 
@@ -1891,7 +1850,7 @@ msgstr "Convidar para Guilda"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "Desaparecer"
 
@@ -1908,9 +1867,9 @@ msgstr "Desaparecer"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "Mover"
@@ -1919,7 +1878,7 @@ msgstr "Mover"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Falar"
@@ -1934,7 +1893,7 @@ msgstr "Falar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1952,7 +1911,7 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1964,26 +1923,26 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 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:320
+#: src/gui/popups/popupmenu.cpp:321
 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:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
@@ -1991,19 +1950,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:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 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:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr ""
 
@@ -2011,7 +1970,7 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr ""
 
@@ -2021,8 +1980,8 @@ msgstr ""
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "Renomear"
@@ -2031,13 +1990,13 @@ msgstr "Renomear"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr ""
 
@@ -2045,7 +2004,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2058,7 +2017,7 @@ msgstr "Desequipar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr ""
 
@@ -2066,39 +2025,88 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "Cancelar"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Chutar do grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Nome no chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "Mapa Item"
 
@@ -2108,28 +2116,28 @@ msgstr "Mapa Item"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "A Remover"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr "Urdidura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr "Mover câmera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr ""
 
@@ -2138,7 +2146,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2146,69 +2154,68 @@ msgstr "Roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr "Limpar equipamento"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 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:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "Limpar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 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:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "Remover nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "Habilitar longe do teclado"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 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:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "Sair"
 
@@ -2218,116 +2225,116 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr "CopiaCopiar para a área de transferência"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr "Jogador"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 msgid "Rename map sign          "
 msgstr "Renomear mapa          "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 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:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr "Comentário:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 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:1745
+#: src/gui/popups/popupmenu.cpp:1762
 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:1750
+#: src/gui/popups/popupmenu.cpp:1767
 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:1754
+#: src/gui/popups/popupmenu.cpp:1771
 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:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr "Add. todos na negociação"
 
@@ -2336,8 +2343,8 @@ msgstr "Add. todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2345,63 +2352,63 @@ msgstr "Armazenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "Guardar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "Guardar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr "Armazenar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Guardar tudo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "Retirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr "Recuperar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
@@ -2412,17 +2419,17 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
@@ -2431,43 +2438,43 @@ msgstr "Queda nítida de janela"
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 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:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr "Copiar para o chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "Mover a cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr "Mover a baixo"
 
@@ -2475,175 +2482,245 @@ msgstr "Mover a baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr "Abrir link"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr "Mostrar janela"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "Padrão"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr "Alvo"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Auto-ajustar posição"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 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:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 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:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr "Definir como inimigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "Ser Amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "Vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "Mostar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr "Remover lista de pegar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 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:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -2651,38 +2728,38 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr ""
 
@@ -2691,7 +2768,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2700,7 +2777,7 @@ msgstr "Inventário"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr "Armazém"
 
@@ -2709,7 +2786,7 @@ msgstr "Armazém"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2718,31 +2795,31 @@ msgstr "Carrinho"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Comandos"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr ""
 
@@ -2750,7 +2827,7 @@ msgstr ""
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr ""
 
@@ -2758,109 +2835,109 @@ msgstr ""
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2868,31 +2945,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr "Chutar"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2901,19 +2978,19 @@ msgstr ""
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2925,8 +3002,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2934,63 +3011,82 @@ msgstr "Informações"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "Sair do grupo?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr ""
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Auto-ajustar posição"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "Tipo: %s"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3525,6 +3621,11 @@ msgstr "Linguagem"
 msgid "Party"
 msgstr "Grupo"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Falta o nome do grupo."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3533,15 +3634,13 @@ msgstr "Compartilhamento de itens habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
@@ -3552,22 +3651,19 @@ msgstr "Compartilhamento de itens desconhecido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
@@ -4008,15 +4104,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Cores"
 
@@ -4040,9 +4136,11 @@ msgstr "Mostrar lista de cores do chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4069,9 +4167,11 @@ msgstr "Limite de caracteres na linha de chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4082,7 +4182,9 @@ msgstr "Limite de linhas máximas no chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4123,8 +4225,8 @@ msgstr "Mostrar mensagens antigas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4135,9 +4237,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4148,9 +4252,11 @@ msgstr "Mostrar mensagens online da Guilda"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4166,9 +4272,13 @@ msgstr "Esconder mensagens de loja"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4181,7 +4291,8 @@ msgstr "Ver mensagens MVP"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4200,9 +4311,12 @@ msgstr "Deixar as mensagens privadas em abas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4213,7 +4327,8 @@ msgstr "Salvar comandos de feitiços na aba do Depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4226,9 +4341,11 @@ msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4253,9 +4370,11 @@ msgstr "Habilitar aba de gm"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4266,7 +4385,8 @@ msgstr "Habilitar aba de linguagem"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4279,7 +4399,9 @@ msgstr "Mostrar todas mensagens de linguagem"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4292,7 +4414,9 @@ msgstr "Habilitar aba de batalha"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4318,7 +4442,10 @@ msgstr "Redimensionar as abas de chat caso precisar"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4353,7 +4480,8 @@ msgstr "Palavras Destacadas (separadas por vírgulas)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4366,7 +4494,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4379,9 +4508,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4470,11 +4602,6 @@ msgid "Unassign"
 msgstr "Retirar"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "Padrão"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Resetar todas teclas"
@@ -4495,7 +4622,9 @@ msgstr "Conflitos de teclas detectado."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não comprometer a jogabilidade."
+msgstr ""
+"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
+"comprometer a jogabilidade."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5543,13 +5672,16 @@ msgstr "Nenhum"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
+msgstr ""
+"Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Falha ao mudar para o modo tela cheia e falha na restauração do modo anterior!"
+msgstr ""
+"Falha ao mudar para o modo tela cheia e falha na restauração do modo "
+"anterior!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5590,7 +5722,8 @@ msgstr "Resolução de tela alterada"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
+msgstr ""
+"Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -5759,70 +5892,70 @@ msgid "Atk"
 msgstr "Atq"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr "Mobs Prioritarios"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr "Atacar Mobs"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr "Ignorar mobs"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Convidou o jogador %s para a guilda %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Saída da Guilda %s requisitada."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "Convite de membros para a Guilda."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Quem você gostaria de convidar para a guilda %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "Sair da guilda?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
@@ -5834,41 +5967,41 @@ msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Convidou usuário %s para o grupo."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Saída do grupo %s requisitada."
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "Convite de membros para o grupo"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Quem você gostaria de convidar para o grupo %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "Sair do grupo?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair do grupo %s?"
@@ -5880,17 +6013,17 @@ msgid "Pik"
 msgstr "Pik"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr "Pegar itens"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr "Ignorar itens"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
@@ -6123,10 +6256,8 @@ msgstr "Quantidade:"
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Criar"
 
@@ -6243,8 +6374,7 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6262,8 +6392,7 @@ msgstr "Por favor distribua %d pontos"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6289,8 +6418,7 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr "A"
 
@@ -6389,7 +6517,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "Hp: %u/%u\nMp: %u/%u\nNível: %u\nExperiência: %u\nDinheiro: %s"
+msgstr ""
+"Hp: %u/%u\n"
+"Mp: %u/%u\n"
+"Nível: %u\n"
+"Experiência: %u\n"
+"Dinheiro: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6455,11 +6588,6 @@ msgid "Yes"
 msgstr "Sim"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr "Alvo"
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr "Rede"
@@ -6491,8 +6619,7 @@ msgstr "Editar Servidor"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Conectar"
 
@@ -6561,8 +6688,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr ""
 
@@ -6858,15 +6985,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7268,173 +7393,138 @@ msgid "Up"
 msgstr "+"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, 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:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "Convidar"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Criando guilda chamada %s."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "Criando grupo chamado %s."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "Nome da guilda"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "Escolha o nome da sua guilda."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar na guilda %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado(a) para entrar em um grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado(a) para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "Não foi possível criar o grupo. Você já faz parte de um."
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "Nome do grupo"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "Escolha o nome do seu grupo."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7574,9 +7664,9 @@ msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -7661,25 +7751,25 @@ msgstr "Escolher Mundo"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr "JBotão%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr "Tecla desconhecida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7687,7 +7777,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "Tecla u"
 
@@ -8988,7 +9078,9 @@ msgstr "Rejeitado pelo servidor."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Você foi permanentemente banido(a) do jogo. Por favor entre em contato com algum GM."
+msgstr ""
+"Você foi permanentemente banido(a) do jogo. Por favor entre em contato com "
+"algum GM."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -9003,7 +9095,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Você banido(a) do jogo até %s.\nPor favor entre em contato com algum GM através do fórum."
+msgstr ""
+"Você banido(a) do jogo até %s.\n"
+"Por favor entre em contato com algum GM através do fórum."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -9884,7 +9978,8 @@ msgstr ""
 #: src/resources/notifications.h:262
 #, c-format
 msgid "Trading with %s isn't possible. Trade partner is too far away."
-msgstr "Negociação com %s é impossível. O parceiro de negócios está muito longe."
+msgstr ""
+"Negociação com %s é impossível. O parceiro de negócios está muito longe."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:267
@@ -10573,30 +10668,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr ""
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -10607,11 +10702,6 @@ msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr ""
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr ""
@@ -10630,7 +10720,8 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr ""
+"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10686,3 +10777,30 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundos"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Falta o nome da guilda."
+
+#~ msgid "Invite"
+#~ msgstr "Convidar"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "Criando guilda chamada %s."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "Criando grupo chamado %s."
+
+#~ msgid "Guild Name"
+#~ msgstr "Nome da guilda"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "Escolha o nome da sua guilda."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "Não foi possível criar o grupo. Você já faz parte de um."
+
+#~ msgid "Party Name"
+#~ msgstr "Nome do grupo"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "Escolha o nome do seu grupo."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7a1159be5..e178d9e19 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # alastrim <alasmirt@gmail.com>, 2013
 # alastrim <alasmirt@gmail.com>, 2011-2012
@@ -26,14 +26,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/language/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/akaras/manaplus/"
+"language/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -47,7 +48,6 @@ msgstr "Arquivo enviado"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -67,10 +67,9 @@ msgstr "Arquivo enviado"
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -119,80 +118,89 @@ msgid "Uploaded log into:"
 msgstr "Registro enviado em:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
-msgstr "Visto pela última vez desativado. Ativar em jogadores / recolher id de jogadores e log visto."
+msgstr ""
+"Visto pela última vez desativado. Ativar em jogadores / recolher id de "
+"jogadores e log visto."
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr "Você não viu esse apelido."
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr "Visto pela última vez por %s: %s"
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr "Não é possível enviar mensages privadas ou de canal vazias!"
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr "Não foi possível criar uma aba de mensagem privada \"%s\"! Provavelmente ela já existe."
+msgstr ""
+"Não foi possível criar uma aba de mensagem privada \"%s\"! Provavelmente ela "
+"já existe."
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Falta o nome do grupo."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Criar grupo"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Falta o nome da guilda."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Desfazer aliança"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr "nenhum chapéu equipado."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr "chapéu %s equipado."
@@ -466,8 +474,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -551,8 +559,8 @@ msgstr "Ajuda"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -729,7 +737,9 @@ msgstr "  -H --update-host    : Usar este host de update"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Escolhe um personagem e um servidor de personagem padrão"
+msgstr ""
+"  -D --default        : Escolhe um personagem e um servidor de personagem "
+"padrão"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:93
@@ -739,12 +749,14 @@ msgstr "  -u --skip-update    : Não faz downloads de atualização"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:96
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
+msgstr ""
+"  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:99
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
+msgstr ""
+"  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:103
@@ -1254,21 +1266,24 @@ msgstr "Mensagem"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr "Reviver"
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Você está carregando mais que a metade de seu peso. Você não poderá mais recuperar HP."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Você está carregando mais que a metade de seu peso. Você não poderá mais "
+"recuperar HP."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Você está carregando menos ou metade de seu peso. Você pode recuperar-se novamente."
+msgstr ""
+"Você está carregando menos ou metade de seu peso. Você pode recuperar-se "
+"novamente."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1279,8 +1294,7 @@ msgstr "Você está carregando menos ou metade de seu peso. Você pode recuperar
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "padrão"
 
@@ -1441,8 +1455,8 @@ msgstr "Enorme (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(padrão)"
 
@@ -1748,8 +1762,8 @@ msgstr "Sala de chat: %s"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1768,58 +1782,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "Criar grupo"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "Cancelar"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1841,7 +1803,7 @@ msgstr "Cartões: "
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1855,8 +1817,8 @@ msgstr "Negociação"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "Ataque"
@@ -1867,36 +1829,36 @@ msgstr "Ataque"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "Sussurro"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "Cura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "Expulsar da guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 msgid "Change pos in guild"
 msgstr "Mudar pos na Guilda"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "Convidar pra Guilda"
 
@@ -1904,7 +1866,7 @@ msgstr "Convidar pra Guilda"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "Desaparecer"
 
@@ -1921,9 +1883,9 @@ msgstr "Desaparecer"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "Mover"
@@ -1932,7 +1894,7 @@ msgstr "Mover"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Falar"
@@ -1947,7 +1909,7 @@ msgstr "Falar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1965,7 +1927,7 @@ msgstr "Comprar"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1977,26 +1939,26 @@ msgstr "Vender"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr "Adicionar comentário"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 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:320
+#: src/gui/popups/popupmenu.cpp:321
 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:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "Adicionar a lista de ataques"
 
@@ -2004,19 +1966,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:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 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:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr "Mover para o mestre"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr "Dispensar"
 
@@ -2024,7 +1986,7 @@ msgstr "Dispensar"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr "Alimentar"
 
@@ -2034,8 +1996,8 @@ msgstr "Alimentar"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "Renomear"
@@ -2044,13 +2006,13 @@ msgstr "Renomear"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr "Matar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr "Descartar saque"
 
@@ -2058,7 +2020,7 @@ msgstr "Descartar saque"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2071,7 +2033,7 @@ msgstr "Desequipar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr "Retornar ao ovo"
 
@@ -2079,39 +2041,88 @@ 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:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "Cancelar"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Jogadores"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Expulsar do grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "Pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Nome no chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "Mapa Item"
 
@@ -2121,28 +2132,28 @@ msgstr "Mapa Item"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "Remover"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr "Urdidura"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr "Mover câmera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr "Restaurar câmera"
 
@@ -2151,7 +2162,7 @@ msgstr "Restaurar câmera"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2159,69 +2170,68 @@ msgstr "Roupas"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr "Limpar conjunto de roupas"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Feitiços"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 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:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "Limpar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "Desabilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr "Habilitar destaque"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 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:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "Remover o nome"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "Habilitar modo indisponível"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 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:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "Sair"
 
@@ -2231,116 +2241,116 @@ msgstr "Sair"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr "Copiar para a área de transferência"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "Mudar a posição da guilda"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr "janela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr "Desbloquear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr "Bloquear"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr "Mostrar emoticons para:"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr "Jogador"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr "Animal de Estimação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr "Homúnculos"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr "Mercenario(s)"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 msgid "Rename map sign          "
 msgstr "Renomear mapa            "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "Nome:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 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:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr "Comentário:                   "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 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:1745
+#: src/gui/popups/popupmenu.cpp:1762
 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:1750
+#: src/gui/popups/popupmenu.cpp:1767
 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:1754
+#: src/gui/popups/popupmenu.cpp:1771
 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:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr "Adicionar todos na negociação"
 
@@ -2349,8 +2359,8 @@ msgstr "Adicionar todos na negociação"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2358,63 +2368,63 @@ msgstr "Armazenar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "Guardar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "Guardar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr "Armazenar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Guardar tudo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr "Mover para ofício..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "Retirar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "Retirar 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 msgid "Retrieve half"
 msgstr "Retirar metade"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr "Recuperar todos-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Retirar tudo"
 
@@ -2425,17 +2435,17 @@ msgstr "Retirar tudo"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Usar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr "Queda nítida de janela"
 
@@ -2444,43 +2454,43 @@ msgstr "Queda nítida de janela"
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "Ocultar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "Mostrar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr "Abrir as configurações da barra amarela"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 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:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr "Copiar para chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "Mover para cima"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr "Mover para baixo"
 
@@ -2488,175 +2498,245 @@ msgstr "Mover para baixo"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr "Despir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr "Copiar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr "Colar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr "Abrir endereço"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr "Mostrar Janela"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr "Level máximo"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "Padrão"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr "Alvo"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Auto-ajustar posição"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr "Você mesmo(a)"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 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:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 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:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr "Lista Negra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr "Definir como inimigo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr "Apagar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "Ser amigo(a)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "Não ignorar"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "Seguir"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr "Imitar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "Comprar (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "vender (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "Convidar para grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr "Entrar no chat %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "Mostrar itens"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr "Remover da lista de pegar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 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:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr "Desproteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr "Proteger item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Descartar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "Descartar tudo"
 
@@ -2664,38 +2744,38 @@ msgstr "Descartar tudo"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Descartar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr "Mostrar %s"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr "Informações da conta"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr "Nível"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr "Status"
 
@@ -2704,7 +2784,7 @@ msgstr "Status"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2713,7 +2793,7 @@ msgstr "Inventário"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr "Armazém"
 
@@ -2722,7 +2802,7 @@ msgstr "Armazém"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2731,31 +2811,31 @@ msgstr "Carrinho"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Comandos"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr "Comandos do personagem"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr "Voltar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr "Localizar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr "Checar IP"
 
@@ -2763,7 +2843,7 @@ msgstr "Checar IP"
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr "Ir à"
 
@@ -2771,109 +2851,109 @@ msgstr "Ir à"
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr "Trazer jogador"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr "Trazer grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr "Trazer aliança"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr "Passar a liderança do grupo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr "Mostrar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr "Silenciar..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr "Imortal"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr "Prender"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr "Soltar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr "Assassino"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr "Pode ser morto"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr "Salvar local"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr "Mover para local salvo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr "Mover aleatóriamente"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr "Gerar clone"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr "Gerar clone escravo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr "Gerar clone maligno"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr "Desfazer aliança"
 
@@ -2881,31 +2961,31 @@ msgstr "Desfazer aliança"
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr "Chutar"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr "Silenciar %s"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr "Silenciar %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr "Liberar %d"
@@ -2914,19 +2994,19 @@ msgstr "Liberar %d"
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr "Disfarce"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr "Gerar o mesmo"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr "Gerar escravo"
 
@@ -2938,8 +3018,8 @@ msgstr "Gerar escravo"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2947,63 +3027,82 @@ msgstr "Informações"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr "Pesquisa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr "Pesquisar gerações"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr "Quem descartou"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr "Comandos de GM"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr "Mover para ofício %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr "Escrever para..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr "Domesticar animal de estimação"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr "Adotar criança"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "Sair do grupo?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr "Level: %d / %d"
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr "Level: Desconhecido"
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Auto-ajustar posição"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "Tipo: %s"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3538,6 +3637,11 @@ msgstr "Idioma"
 msgid "Party"
 msgstr "Grupo"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Falta o nome do grupo."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3546,15 +3650,13 @@ msgstr "Compartilhamento de itens habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
@@ -3565,22 +3667,19 @@ msgstr "Compartilhamento de itens desconhecido."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
@@ -4009,7 +4108,10 @@ msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
 "Hit Enter or hover mouse to show chat again."
-msgstr "O bate-papo será automaticamente fechado quando não estiver em uso.\n\nPressione enter ou passe o cursor para exibir o bate-papo novamente."
+msgstr ""
+"O bate-papo será automaticamente fechado quando não estiver em uso.\n"
+"\n"
+"Pressione enter ou passe o cursor para exibir o bate-papo novamente."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4021,15 +4123,19 @@ msgstr "Proteger foco do chat"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
-msgstr "Permite a proteção agressiva de foco de entrada na janela de bate-papo.\n\nNota: não há outras entradas de texto serão autorizados a receber a entrada de texto quando você digitar na janela de bate-papo."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
+msgstr ""
+"Permite a proteção agressiva de foco de entrada na janela de bate-papo.\n"
+"\n"
+"Nota: não há outras entradas de texto serão autorizados a receber a entrada "
+"de texto quando você digitar na janela de bate-papo."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Cores"
 
@@ -4043,7 +4149,10 @@ msgstr "Remover mensagens coloridas do chat"
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
-msgstr "Ative esta configuração para tirar as cores de mensagens de bate-papo recebidas. Todas as mensagens de bate-papo irão usar a cor padrão caso seja habilitado."
+msgstr ""
+"Ative esta configuração para tirar as cores de mensagens de bate-papo "
+"recebidas. Todas as mensagens de bate-papo irão usar a cor padrão caso seja "
+"habilitado."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:77
@@ -4053,10 +4162,17 @@ msgstr "Mostrar lista de cores do chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
+"\n"
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
+msgstr ""
+"Ative esta configuração para mostrar a seleção de cor drop-down na janela de "
+"bate-papo. A janela de chat irá exibir a seleção de cor drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
-msgstr "Ative esta configuração para mostrar a seleção de cor drop-down na janela de bate-papo. A janela de chat irá exibir a seleção de cor drop-down.\n\nIsto permite selecionar a cor padrão de mensagens de bate-papo de saída facilmente, mas também ocupa algum espaço na janela de bate-papo."
+"Isto permite selecionar a cor padrão de mensagens de bate-papo de saída "
+"facilmente, mas também ocupa algum espaço na janela de bate-papo."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:90
@@ -4067,7 +4183,9 @@ msgstr "Permitir feitiços e comandos de GM em todas abas"
 #: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
-msgstr "Habilite essa configuração para ser capaz de escrever magias e comandos da GM em qualquer guia."
+msgstr ""
+"Habilite essa configuração para ser capaz de escrever magias e comandos da "
+"GM em qualquer guia."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:98
@@ -4082,10 +4200,16 @@ msgstr "Limite de caracteres na linha de chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
+"\n"
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
+msgstr ""
+"Limite quantos caracteres serão exibidos em linhas de texto no bate-papo.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
-msgstr "Limite quantos caracteres serão exibidos em linhas de texto no bate-papo.\n\nNota: linhas longas podem deixar o cliente mais lento. Linhas mais longas do que esse limite serão cortadas."
+"Nota: linhas longas podem deixar o cliente mais lento. Linhas mais longas do "
+"que esse limite serão cortadas."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:110
@@ -4095,10 +4219,17 @@ msgstr "Limite de linhas máximas no chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
-msgstr "Limita o número de linhas de bate-papo que ficam no rolamento da aba de bate-papo. Mantém o número especificado de últimas linhas do texto. Linhas mais antigas que excedem esse limite são descartadas.\n\nNota: mantendo muitas linhas na rolagem podem deixar o cliente lento."
+msgstr ""
+"Limita o número de linhas de bate-papo que ficam no rolamento da aba de bate-"
+"papo. Mantém o número especificado de últimas linhas do texto. Linhas mais "
+"antigas que excedem esse limite são descartadas.\n"
+"\n"
+"Nota: mantendo muitas linhas na rolagem podem deixar o cliente lento."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:120
@@ -4116,7 +4247,11 @@ msgid ""
 "If you enable this setting, chat logs will be written to disk.\n"
 "\n"
 "Note: chat logs can take noticeable amount of disk space over time."
-msgstr "Caso habilite esta configuração, os registros de bate-papo serão gravados no disco.\n\nNota: Com o passar do tempo isto pode consumir muito espaço do disco."
+msgstr ""
+"Caso habilite esta configuração, os registros de bate-papo serão gravados no "
+"disco.\n"
+"\n"
+"Nota: Com o passar do tempo isto pode consumir muito espaço do disco."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:131
@@ -4136,9 +4271,12 @@ msgstr "Mostrar mensagens antigas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
-msgstr "Caso esta configuração esteja ativada, o cliente irá carregar conteúdo de abas de bate-papo a partir de registros em vez de começar com abas de bate-papo vazias."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
+msgstr ""
+"Caso esta configuração esteja ativada, o cliente irá carregar conteúdo de "
+"abas de bate-papo a partir de registros em vez de começar com abas de bate-"
+"papo vazias."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:144
@@ -4148,10 +4286,17 @@ msgstr "Mostrar mensagens de membros do grupo online"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
+"\n"
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
+msgstr ""
+"Caso esta configuração seja habilitada, sempre que um membro do seu grupo "
+"entrar ou sair do jogo uma mensagem será exibida na aba de grupo .\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
-msgstr "Caso esta configuração seja habilitada, sempre que um membro do seu grupo entrar ou sair do jogo uma mensagem será exibida na aba de grupo .\n\nIsso adiciona alguma interferência na conversa, mas permite ver quando seus amigos estão online."
+"Isso adiciona alguma interferência na conversa, mas permite ver quando seus "
+"amigos estão online."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:152
@@ -4161,10 +4306,17 @@ msgstr "Mostrar mensagens de guildas online"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
+"\n"
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
+msgstr ""
+"Caso esta configuração seja habilitada, sempre que um membro da sua guilda "
+"entrar ou sair do jogo uma mensagem será exibida na aba de guilda .\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
-msgstr "Caso esta configuração seja habilitada, sempre que um membro da sua guilda entrar ou sair do jogo uma mensagem será exibida na aba de guilda .\n\nIsso adiciona alguma interferência na conversa, mas permite ver quando seus amigos estão online."
+"Isso adiciona alguma interferência na conversa, mas permite ver quando seus "
+"amigos estão online."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:161
@@ -4179,10 +4331,21 @@ msgstr "Esconder mensagens de loja"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
-msgstr "Se essa configuração for ativada, não serão exibidas mensagens relacionadas a loja pessoal do ManaPlus será exibido no chat. Desabilite esta configuração caso queira ver as mensagens relacionadas a loja.\nNota: tecnicamente, a loja do ManaPlus foi implementado como mensagens privadas habituais com conteúdo especial. Se você desabilitar essa configuração, você será capaz de ver essas mensagens e obter uma ideia de quando os jogadores estão  olhando sua loja."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
+msgstr ""
+"Se essa configuração for ativada, não serão exibidas mensagens relacionadas "
+"a loja pessoal do ManaPlus será exibido no chat. Desabilite esta "
+"configuração caso queira ver as mensagens relacionadas a loja.\n"
+"Nota: tecnicamente, a loja do ManaPlus foi implementado como mensagens "
+"privadas habituais com conteúdo especial. Se você desabilitar essa "
+"configuração, você será capaz de ver essas mensagens e obter uma ideia de "
+"quando os jogadores estão  olhando sua loja."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:175
@@ -4194,8 +4357,13 @@ msgstr "Ver Mensagens MVP"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
-msgstr "Habilite essa configuração para ver as mensagens de MVP server..\n\nNota: As mensagens MVP não são usados no TMW / Evol / etc servidores, por isso este recurso geralmente faz pouca diferença."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
+msgstr ""
+"Habilite essa configuração para ver as mensagens de MVP server..\n"
+"\n"
+"Nota: As mensagens MVP não são usados no TMW / Evol / etc servidores, por "
+"isso este recurso geralmente faz pouca diferença."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: input action group
@@ -4213,10 +4381,20 @@ msgstr "Deixar as mensagens privadas em abas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
-msgstr "Caso esta configuração esteja ativa, todos os whispers (mensagens privadas) serão colocados em abas separadas, uma aba para cada jogador. Se essa configuração for desativada, todos os whispers aparecerão na aba geral Geral.\n\nNota: Pense duas vezes antes de desabilitar esse recurso. Receber todos os whispers na aba geral pode ser bastante confuso."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
+msgstr ""
+"Caso esta configuração esteja ativa, todos os whispers (mensagens privadas) "
+"serão colocados em abas separadas, uma aba para cada jogador. Se essa "
+"configuração for desativada, todos os whispers aparecerão na aba geral "
+"Geral.\n"
+"\n"
+"Nota: Pense duas vezes antes de desabilitar esse recurso. Receber todos os "
+"whispers na aba geral pode ser bastante confuso."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:197
@@ -4226,10 +4404,16 @@ msgstr "Salvar comandos de feitiços na aba do Depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
-msgstr "Se essa configuração for habilitada, a conjuração de feitiço será exibido na aba Debug. Se desativado, eles serão exibidos na aba Geral.\n\nNota: Isto não afeta no feitiço, apenas muda a aba que ele é exibido quando conjurado.."
+msgstr ""
+"Se essa configuração for habilitada, a conjuração de feitiço será exibido na "
+"aba Debug. Se desativado, eles serão exibidos na aba Geral.\n"
+"\n"
+"Nota: Isto não afeta no feitiço, apenas muda a aba que ele é exibido quando "
+"conjurado.."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:205
@@ -4239,10 +4423,19 @@ msgstr "Mostrar as mensagens do servidor na aba do Depurador"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
-msgstr "Se essa configuração for habilitada, as mensagens do servidor serão exibidas na aba de depuração do bate-papo. Se desativada, as mensagens do servidor irão aparecer na aba geral do bate-papo.\n\nNota: de acordo com o 4144, a desativação disto também poderia fazer com que você perca algumas mensagens de depuração do cliente uma vez que estas são as mensagens do servidor falso."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
+msgstr ""
+"Se essa configuração for habilitada, as mensagens do servidor serão exibidas "
+"na aba de depuração do bate-papo. Se desativada, as mensagens do servidor "
+"irão aparecer na aba geral do bate-papo.\n"
+"\n"
+"Nota: de acordo com o 4144, a desativação disto também poderia fazer com que "
+"você perca algumas mensagens de depuração do cliente uma vez que estas são "
+"as mensagens do servidor falso."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:215
@@ -4256,7 +4449,12 @@ msgid ""
 "words typical for trades will go to Trade tab. This will make General tab "
 "less noisy. If this setting is disabled, all trade related players messages "
 "will stay in General tab."
-msgstr "Permite a aba de comércio. A aba de comércio é basicamente um filtro. Mensagens contendo palavras típicas de comércio vão automaticamente para a aba de comércio. Isso fará com que a aba geral fique menos poluída. Se essa configuração for desativada, todas as mensagens relacionadas com o comércio irão ser exibidas na aba geral."
+msgstr ""
+"Permite a aba de comércio. A aba de comércio é basicamente um filtro. "
+"Mensagens contendo palavras típicas de comércio vão automaticamente para a "
+"aba de comércio. Isso fará com que a aba geral fique menos poluída. Se essa "
+"configuração for desativada, todas as mensagens relacionadas com o comércio "
+"irão ser exibidas na aba geral."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:224
@@ -4266,10 +4464,17 @@ msgstr "Habilitar aba de gm"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
+"\n"
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
+msgstr ""
+"Se ativado, a aba GM irá aparecer no chat. Ela exibe o texto relacionado a "
+"GMs.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
-msgstr "Se ativado, a aba GM irá aparecer no chat. Ela exibe o texto relacionado a GMs.\n\nNota: essa configuração só faz diferença para GMs (Game Masters) já que esta aba só aparece para GMs."
+"Nota: essa configuração só faz diferença para GMs (Game Masters) já que esta "
+"aba só aparece para GMs."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:232
@@ -4279,10 +4484,15 @@ msgstr "Habilitar aba de idiomas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
-msgstr "Se esse recurso for ativado, a aba idioma ira aparecer se o servidor tiver suporte para idiomas.\n\nNota: apenas o servidor Evol tem suporte para isto ate o momento."
+msgstr ""
+"Se esse recurso for ativado, a aba idioma ira aparecer se o servidor tiver "
+"suporte para idiomas.\n"
+"\n"
+"Nota: apenas o servidor Evol tem suporte para isto ate o momento."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:240
@@ -4292,10 +4502,18 @@ msgstr "Mostrar mensagens de todos idiomas"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
-msgstr "0Se essa configuração ativada e o  servidor tiver suporte para diferentes idiomas, você verá mensagens para todos os idiomas, independentemente do idioma preferencial.\n\nNota: isto só funciona em servidores que suportam múltiplos abas de idiomas, como o Evol."
+msgstr ""
+"0Se essa configuração ativada e o  servidor tiver suporte para diferentes "
+"idiomas, você verá mensagens para todos os idiomas, independentemente do "
+"idioma preferencial.\n"
+"\n"
+"Nota: isto só funciona em servidores que suportam múltiplos abas de idiomas, "
+"como o Evol."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:250
@@ -4305,10 +4523,17 @@ msgstr "Habilitar aba de batalha"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
-msgstr "Se essa configuração for ativada, a aba Batalha aparecerá no chat. Esta aba irá conter mensagens relacionadas a batalhas, como ganho de danos e experiência, se as mensagens de batalha  forem ativadas.\n\nNota: É necessário reiniciar o cliente para as alterações terem efeito."
+msgstr ""
+"Se essa configuração for ativada, a aba Batalha aparecerá no chat. Esta aba "
+"irá conter mensagens relacionadas a batalhas, como ganho de danos e "
+"experiência, se as mensagens de batalha  forem ativadas.\n"
+"\n"
+"Nota: É necessário reiniciar o cliente para as alterações terem efeito."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:259
@@ -4321,7 +4546,10 @@ msgid ""
 "If this setting enabled, messages related to battle like damage or "
 "experience gain will be displayed in Debug or Battle tab. If disabled, no "
 "battle messages will be displayed."
-msgstr "Se essa configuração for ativada, mensagens relacionadas a batalha como danos ou ganho de experiência será exibido na aba de depuração ou Batalha. Se desativado, nenhuma mensagem de batalha será exibida."
+msgstr ""
+"Se essa configuração for ativada, mensagens relacionadas a batalha como "
+"danos ou ganho de experiência será exibido na aba de depuração ou Batalha. "
+"Se desativado, nenhuma mensagem de batalha será exibida."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:267
@@ -4331,7 +4559,10 @@ msgstr "Redimensionar aba de chat caso precisar"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4356,7 +4587,10 @@ msgstr "Usar tempo local"
 msgid ""
 "If this feature enabled, timestamps in chat will use local times. If "
 "disabled, server time will be used (often it is GMT+0)."
-msgstr "Se esse recurso for ativado, o bate-papo irá utilizar o hora local quando for exibir a hora que a mensagem foi recebida ou enviada. Se desativado, o tempo do servidor será usado (normalmente é o GMT+0)."
+msgstr ""
+"Se esse recurso for ativado, o bate-papo irá utilizar o hora local quando "
+"for exibir a hora que a mensagem foi recebida ou enviada. Se desativado, o "
+"tempo do servidor será usado (normalmente é o GMT+0)."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:297
@@ -4366,10 +4600,15 @@ msgstr "Palavras destacadas (separadas em vírgulas)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
-msgstr "Aqui você pode especificar algumas palavras extras que também serão exibidas com destaque. Use vírgula para separar uma palavra de outra.\n\nNota: Isto pode ser irritante - use este recurso com sabedoria."
+msgstr ""
+"Aqui você pode especificar algumas palavras extras que também serão exibidas "
+"com destaque. Use vírgula para separar uma palavra de outra.\n"
+"\n"
+"Nota: Isto pode ser irritante - use este recurso com sabedoria."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:305
@@ -4379,10 +4618,17 @@ msgstr "Nomes globais à ignorar (separados por virgula)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
-msgstr "Esta configuração permite ignorar algumas mensagens globais se determinado remetente (NPC, GM) é muito irritante. O anuncio será movido para a aba de depuração instantaneamente.\n\nNota: o uso descuidado deste recurso pode fazer com que você perca anúncios importantes!"
+msgstr ""
+"Esta configuração permite ignorar algumas mensagens globais se determinado "
+"remetente (NPC, GM) é muito irritante. O anuncio será movido para a aba de "
+"depuração instantaneamente.\n"
+"\n"
+"Nota: o uso descuidado deste recurso pode fazer com que você perca anúncios "
+"importantes!"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:314
@@ -4392,10 +4638,19 @@ msgstr "Mostrar botão de emoticon no chat"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
+"\n"
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
+msgstr ""
+"Se essa configuração for ativada, o botão aparecerá perto do campo de "
+"entrada de texto. Este botão permite abrir a janela de edição, o que permite "
+"a inclusão de sorrisos e formatação de texto facilmente.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
-msgstr "Se essa configuração for ativada, o botão aparecerá perto do campo de entrada de texto. Este botão permite abrir a janela de edição, o que permite a inclusão de sorrisos e formatação de texto facilmente.\n\nNota: mesma janela também pode ser aberta pelo atalho durante a digitação, normalmente F1 por padrão."
+"Nota: mesma janela também pode ser aberta pelo atalho durante a digitação, "
+"normalmente F1 por padrão."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:324
@@ -4407,7 +4662,10 @@ msgstr "Mostrar mensagem do dia ao começar"
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
-msgstr "Se essa configuração for ativada, o cliente irá exibir MOTD  do servidor (mensagem do dia) uma vez que você se conectar ao servidor. Desative-a para esconder não ter a MOTD exibida."
+msgstr ""
+"Se essa configuração for ativada, o cliente irá exibir MOTD  do servidor "
+"(mensagem do dia) uma vez que você se conectar ao servidor. Desative-a para "
+"esconder não ter a MOTD exibida."
 
 #. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
@@ -4483,11 +4741,6 @@ msgid "Unassign"
 msgstr "Retirar"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "Padrão"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Resetar todas teclas"
@@ -4508,7 +4761,9 @@ msgstr "Conflitos de teclas detectado."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não comprometer a jogabilidade."
+msgstr ""
+"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
+"comprometer a jogabilidade."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5056,7 +5311,8 @@ msgstr "Aceleração por HW"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 msgid "Enable opacity cache (Software, can use much memory)"
-msgstr "Habilitar cache de transparência (Software, pode se usar muita memória)"
+msgstr ""
+"Habilitar cache de transparência (Software, pode se usar muita memória)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:79
@@ -5141,7 +5397,8 @@ msgstr "Ativar atlas de textura (OpenGL)"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:150
 msgid "Cache all sprites per map (can use additional memory)"
-msgstr "Guardar todos os sprites do mapa em cache (pode usar memória adicional)"
+msgstr ""
+"Guardar todos os sprites do mapa em cache (pode usar memória adicional)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:155
@@ -5277,7 +5534,9 @@ msgstr "Tira uma foto da tela a cada negociação completa."
 #: src/gui/widgets/tabs/setup_players.cpp:143
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
-msgstr "Simular clique com o botão direito por clique prolongado com o botão esquerdo (útil para interfaces de toque)"
+msgstr ""
+"Simular clique com o botão direito por clique prolongado com o botão "
+"esquerdo (útil para interfaces de toque)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:148
@@ -5556,13 +5815,16 @@ msgstr "Nenhum"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
+msgstr ""
+"Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Falha ao mudar para o modo tela cheia e falha na restauração do modo anterior!"
+msgstr ""
+"Falha ao mudar para o modo tela cheia e falha na restauração do modo "
+"anterior!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5603,7 +5865,8 @@ msgstr "Resolução de tela alterada"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
+msgstr ""
+"Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -5772,70 +6035,70 @@ msgid "Atk"
 msgstr "Ataque"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr "Mobs prioritarios"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr "Atacar mobs"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr "Ignorar mobs"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr "Amigos: %u/%u"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr "Jogadores: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Convidou o jogador %s para a guilda %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Saída da Guilda %s requisitada."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "Convite de membros para a Guilda."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Quem você gostaria de convidar para a guilda %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "Sair da guilda?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr "Membros: %u/%u"
@@ -5847,41 +6110,41 @@ msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr "Portais: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Convidou usuário %s para o grupo."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Saída do grupo %s requisitada."
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "Convite de membros para o grupo"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Quem você gostaria de convidar para o grupo %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "Sair do grupo?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair do grupo %s?"
@@ -5893,17 +6156,17 @@ msgid "Pik"
 msgstr "Pik"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr "Pegar itens"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr "Ignorar itens"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr "Jogadores visíveis: %d"
@@ -6136,10 +6399,8 @@ msgstr "Quantidade:"
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Criar"
 
@@ -6256,8 +6517,7 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6275,8 +6535,7 @@ msgstr "Por favor distribua %d pontos"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6302,8 +6561,7 @@ msgstr "Aparência:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr "A"
 
@@ -6402,7 +6660,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "Hp: %u/%u\nMp: %u/%u\nNível: %u\nExperiência: %u\nDinheiro: %s"
+msgstr ""
+"Hp: %u/%u\n"
+"Mp: %u/%u\n"
+"Nível: %u\n"
+"Experiência: %u\n"
+"Dinheiro: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6468,11 +6731,6 @@ msgid "Yes"
 msgstr "Sim"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr "Alvo"
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr "Rede"
@@ -6504,8 +6762,7 @@ msgstr "Editar Servidor"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Conectar"
 
@@ -6574,8 +6831,8 @@ msgstr "Fontes"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -6871,15 +7128,13 @@ msgstr "Assunto:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr "Dinheiro:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr "Item:"
@@ -7281,173 +7536,138 @@ msgid "Up"
 msgstr "+"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, 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:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Habilidade falhou: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, 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:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr "Texto: "
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr "J"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "Convidar"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Aceitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Rejeitou convite para a guilda de  %s."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Criando guilda chamada %s."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "Criando grupo chamado %s."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "Nome da guilda"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "Escolha o nome da sua guilda."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar na guilda %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado(a) para entrar em um grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado(a) para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "Não foi possível criar o grupo. Você já faz parte de um."
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "Nome do grupo"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "Escolha o nome do seu grupo."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7587,9 +7807,9 @@ msgstr "Você não tem dinheiro suficiente."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -7674,25 +7894,25 @@ msgstr "Escolher Mundo"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "tecla_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr "BotãoJ%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr "Tecla desconhecida"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7700,7 +7920,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "tecla u"
 
@@ -8911,7 +9131,8 @@ msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
 #. TRANSLATORS: chat message
 #: src/net/ea/chatrecv.cpp:114
 msgid "Whisper could not be sent, you ignored by all players."
-msgstr "Mensagem privada não pode ser enviada, ignorado por todos os jogadores."
+msgstr ""
+"Mensagem privada não pode ser enviada, ignorado por todos os jogadores."
 
 #. TRANSLATORS: error header
 #: src/net/ea/gamerecv.cpp:67
@@ -9001,7 +9222,9 @@ msgstr "Rejeitado pelo servidor."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Você foi permanentemente banido(a) do jogo. Por favor entre em contato com algum GM."
+msgstr ""
+"Você foi permanentemente banido(a) do jogo. Por favor entre em contato com "
+"algum GM."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -9016,7 +9239,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Você banido do jogo até %s.\nPor favor entre em contato com algum GM através do fórum."
+msgstr ""
+"Você banido do jogo até %s.\n"
+"Por favor entre em contato com algum GM através do fórum."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -9897,7 +10122,8 @@ msgstr "Equipe a munição primeiro."
 #: src/resources/notifications.h:262
 #, c-format
 msgid "Trading with %s isn't possible. Trade partner is too far away."
-msgstr "Negociação com %s não é possível. O parceiro de negócios está muito longe."
+msgstr ""
+"Negociação com %s não é possível. O parceiro de negócios está muito longe."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:267
@@ -10103,14 +10329,18 @@ msgstr "Carta inserida."
 msgid ""
 "Deposit failed. You probably don't have this amount of money with you right "
 "now."
-msgstr "Depósito falhou. Você provavelmente não tem esta quantia de dinheiro com você no momento."
+msgstr ""
+"Depósito falhou. Você provavelmente não tem esta quantia de dinheiro com "
+"você no momento."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:427
 msgid ""
 "Withdraw failed. You probably don't have this amount of money in the bank "
 "right now."
-msgstr "Saque falhou. Você provavelmente não tem esta quantia de dinheiro no banco neste momento."
+msgstr ""
+"Saque falhou. Você provavelmente não tem esta quantia de dinheiro no banco "
+"neste momento."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:432
@@ -10152,7 +10382,9 @@ msgstr "A negociação falhou."
 msgid ""
 "The trade failed, because the entered amount of item is higher, than the "
 "buyer is willing to buy."
-msgstr "A negociação falhou, porque a quantidade de itens digitada é maior do que o comprador pretende adquirir."
+msgstr ""
+"A negociação falhou, porque a quantidade de itens digitada é maior do que o "
+"comprador pretende adquirir."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:465
@@ -10568,7 +10800,8 @@ msgstr "Adoção da criança falhou. Seu nível é muito baixo."
 #: src/resources/notifications.h:816
 msgid ""
 "Child adoption failed. This player is already married and can't be a baby."
-msgstr "Adoção da criança falhou. Esse jogador já está casado e não pode ter um bebê."
+msgstr ""
+"Adoção da criança falhou. Esse jogador já está casado e não pode ter um bebê."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:821
@@ -10586,30 +10819,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr "Erro ao salvar localização. Você não possui a habilidade warp."
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr "Lvl: %d / %d"
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr "Desconhecido(a):"
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr " / Mana: -%d"
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr "Alcance: %d"
@@ -10620,11 +10853,6 @@ msgid "Ground"
 msgstr "Chão"
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr "Você mesmo(a)"
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr "Inutilizado"
@@ -10643,7 +10871,8 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr ""
+"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10699,3 +10928,30 @@ msgstr "%d segundos"
 #, c-format
 msgid "%d seconds"
 msgstr "%d Segundos"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Falta o nome da guilda."
+
+#~ msgid "Invite"
+#~ msgstr "Convidar"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "Criando guilda chamada %s."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "Criando grupo chamado %s."
+
+#~ msgid "Guild Name"
+#~ msgstr "Nome da guilda"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "Escolha o nome da sua guilda."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "Não foi possível criar o grupo. Você já faz parte de um."
+
+#~ msgid "Party Name"
+#~ msgstr "Nome do grupo"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "Escolha o nome do seu grupo."
diff --git a/po/ru.po b/po/ru.po
index 62c40f827..015580556 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Alexandr Uspensky <AlexandrUSP@yandex.com>, 2015
 # Alexsl <alexlsh@mail.ru>, 2013-2015
@@ -21,15 +21,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/akaras/manaplus/language/"
+"ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. TRANSLATORS: file uploaded message
 #: src/actions/actions.cpp:164
@@ -42,7 +45,6 @@ msgstr "Файл выгружен"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -62,10 +64,9 @@ msgstr "Файл выгружен"
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -114,80 +115,87 @@ msgid "Uploaded log into:"
 msgstr "Информация о выгруженном логе:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
-msgstr "Сбор информации о пользователя отключен. Включите его в игроки / собирать ид игроков и лог встреч."
+msgstr ""
+"Сбор информации о пользователя отключен. Включите его в игроки / собирать ид "
+"игроков и лог встреч."
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr "Вам не встречался этот ник."
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr "Последняя встреча с %s: %s"
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr "Нельзя отправлять пустые сообщения!"
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
 msgstr "Невозможно создать вкладку \"%s\"! Возможно она уже существует."
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Не указано название группы."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Создать группу"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Не задано имя гильдии."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Разрушить гильдию"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Пожалуйста, укажите имя."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "Enter переключает Вас на окно чата."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "Сообщение закрывает чат."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "Теперь Return переключает чат."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "Теперь сообщение закрывает чат."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr "нет одетой шапки."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr "Одета шапка: %s."
@@ -463,8 +471,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "Полностью игнорировать"
 
@@ -548,8 +556,8 @@ msgstr "Помощь"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -726,7 +734,8 @@ msgstr "  -H --update-host    : Использовать этот узел об�
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
 msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Выбрать персонаж и сервер персонажей по умолчанию"
+msgstr ""
+"  -D --default        : Выбрать персонаж и сервер персонажей по умолчанию"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:93
@@ -761,7 +770,8 @@ msgstr "     --renderer       : Устанавливает тип рендера
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --tests          : Запускает проверку драйверов и автоконфигурацию"
+msgstr ""
+"  -T --tests          : Запускает проверку драйверов и автоконфигурацию"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -1251,21 +1261,24 @@ msgstr "Сообщение"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr "Оживить"
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Вы несете груз больший, чем половина вашей грузоподъемности. Здоровье восстанавливаться не будет."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Вы несете груз больший, чем половина вашей грузоподъемности. Здоровье "
+"восстанавливаться не будет."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Вес предметов составляет менее половины допустимого. Теперь Вы можете восстанавливаться."
+msgstr ""
+"Вес предметов составляет менее половины допустимого. Теперь Вы можете "
+"восстанавливаться."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1276,8 +1289,7 @@ msgstr "Вес предметов составляет менее половин
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "По умолчанию"
 
@@ -1438,8 +1450,8 @@ msgstr "Огромный (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(по умолчанию)"
 
@@ -1745,8 +1757,8 @@ msgstr "Комната чата: %s"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1765,58 +1777,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr "Частицы: %u"
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "Создать группу"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "Отмена"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1838,7 +1798,7 @@ msgstr "Карты: "
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1852,8 +1812,8 @@ msgstr "Торговать"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "Атака"
@@ -1864,36 +1824,36 @@ msgstr "Атака"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "Приват"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "Лечить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "Выкинуть из гильдии"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 msgid "Change pos in guild"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "Пригласить в гильдию"
 
@@ -1901,7 +1861,7 @@ msgstr "Пригласить в гильдию"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "Уничтожить"
 
@@ -1918,9 +1878,9 @@ msgstr "Уничтожить"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "Движение"
@@ -1929,7 +1889,7 @@ msgstr "Движение"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Разговор"
@@ -1944,7 +1904,7 @@ msgstr "Разговор"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1962,7 +1922,7 @@ msgstr "Купить"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1974,26 +1934,26 @@ msgstr "Продать"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr "Добавить комментарий"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 msgid "Remove from attack list"
 msgstr "Удалить из списка атаки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:320
+#: src/gui/popups/popupmenu.cpp:321
 msgid "Add to priority attack list"
 msgstr "Добавить в приоритетный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "Добавить в список атаки"
 
@@ -2001,19 +1961,19 @@ msgstr "Добавить в список атаки"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 msgid "Add to ignore list"
 msgstr "Добавить в список игнорирования"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr "Перейти к владельцу"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr "Уволить"
 
@@ -2021,7 +1981,7 @@ msgstr "Уволить"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr "Накормить"
 
@@ -2031,8 +1991,8 @@ msgstr "Накормить"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "Переименовать"
@@ -2041,13 +2001,13 @@ msgstr "Переименовать"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr "Убить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr "Бросить лут"
 
@@ -2055,7 +2015,7 @@ msgstr "Бросить лут"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2068,7 +2028,7 @@ msgstr "Снять"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr "Вернут в яйцо"
 
@@ -2076,39 +2036,88 @@ msgstr "Вернут в яйцо"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "Добавить имя в чат"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "Отмена"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Игроки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Выкинуть из группы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "Поднять"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Добавить в чат"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "Элемент карты"
 
@@ -2118,28 +2127,28 @@ msgstr "Элемент карты"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "Удалить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr "Прыгнуть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr "Передвинуть камеру"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr "Восстановить камеру"
 
@@ -2148,7 +2157,7 @@ msgstr "Восстановить камеру"
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2156,69 +2165,68 @@ msgstr "Наряды"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr "Очистить наряд"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Заклинания"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 msgid "Edit spell"
 msgstr "Изменить заклинание"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "Очистить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "Отключить уведомление"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr "Включить уведомление"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 msgid "Don't remove name"
 msgstr "Не скрывать имя"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "Скрывать имя"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "Разрешить режим \"отошел\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 msgid "Disable away"
 msgstr "Запретить режим \"отошел\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "Покинуть"
 
@@ -2228,116 +2236,116 @@ msgstr "Покинуть"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr "Копировать в буфер обмена"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "Сменить позицию в гильдии"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr "окно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr "Разблокировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr "Заблокировать"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr "Показывать эмоции для:"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr "Игрок"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr "Животное"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr "Гомункул"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr "Наемник"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 msgid "Rename map sign          "
 msgstr "Переименовать знак на карте "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "Имя:                     "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr "Комментарий игрока        "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr "Комментарий:                  "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 msgid "Add to trade"
 msgstr "Добавить к сделке"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1745
+#: src/gui/popups/popupmenu.cpp:1762
 msgid "Add to trade 10"
 msgstr "Добавить к сделке 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1767
 msgid "Add to trade half"
 msgstr "Добавить к сделке половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1771
 msgid "Add to trade all-1"
 msgstr "Добавить к торговле все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr "Добавить к торговле все"
 
@@ -2346,8 +2354,8 @@ msgstr "Добавить к торговле все"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2355,63 +2363,63 @@ msgstr "Сохранить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "Сохранить 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "Сохранить половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr "Сохранить все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Сохранить все"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr "Поместить в крафт..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "Получить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "Получить 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 msgid "Retrieve half"
 msgstr "Получить половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr "Забрать все-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Получить все"
 
@@ -2422,17 +2430,17 @@ msgstr "Получить все"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Использовать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr "Очистить окно дропов"
 
@@ -2441,43 +2449,43 @@ msgstr "Очистить окно дропов"
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "Спрятать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "Показать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr "Открыть настройки желтой панели"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 msgid "Reset yellow bar"
 msgstr "сбросить настройки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr "Скопировать в чат"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "Передвинуть выше"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr "Передвинуть ниже"
 
@@ -2485,175 +2493,247 @@ msgstr "Передвинуть ниже"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr "Раздеть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr "Копировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr "Вставить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr "Открыть ссылку"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr "Показать окно"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr "Навык"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+#, fuzzy
+msgid "Skill level..."
+msgstr "Выбрать уровень"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+#, fuzzy
+msgid "Select skill level"
 msgstr "Выбрать уровень"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr "Макс. уровень"
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "По умолчанию"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr "Цель"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Авто. исправ. позиции"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr "Сам"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 msgid "Disregard"
 msgstr "Пренебречь"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Игнорировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr "Черный список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr "Сделать врагом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr "Стереть"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "Подружиться"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "Не игнорировать"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "Следовать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr "Имитировать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "Купить (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "Продать (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "Пригласить в группу"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr "Присоединиться к чату %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "Показать предметы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr "Удалить из поднятия"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Add to pickup list"
 msgstr "Сделать поднимаемым"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr "Снять защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr "Поставить защиту"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Бросить..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "Бросить все"
 
@@ -2661,38 +2741,38 @@ msgstr "Бросить все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Бросить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr "Показать %s"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr "Инф. об аккаунте"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr "Уровень"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr "Статы"
 
@@ -2701,7 +2781,7 @@ msgstr "Статы"
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2710,7 +2790,7 @@ msgstr "Инвентарь"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr "Хранилище"
 
@@ -2719,7 +2799,7 @@ msgstr "Хранилище"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2728,31 +2808,31 @@ msgstr "Телега"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Команды"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr "Команды игрока"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr "Назад"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr "Определить"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr "Проверить IP"
 
@@ -2760,7 +2840,7 @@ msgstr "Проверить IP"
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr "Перейти"
 
@@ -2768,109 +2848,109 @@ msgstr "Перейти"
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr "Вызвать"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr "Призвать группу"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr "Призвать гильдию"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr "Установить лидера группы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr "Показать..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr "Заглушить..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr "Безсмертие"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr "В тюрьму"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr "Из тюрьмы"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr "Убийца"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr "Убиваемый"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr "Установить тчк. сохранения"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr "Телепорт в тчк. сохранение"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr "Случайный телепорт"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr "Создать клона"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr "Создать подчиненного клона"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr "Создать злого клона"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr "Разрушить гильдию"
 
@@ -2878,31 +2958,31 @@ msgstr "Разрушить гильдию"
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr "Кикнуть"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr "Заглушить %s"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr "Приглушить %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr "Убрать пришлушение %d"
@@ -2911,19 +2991,19 @@ msgstr "Убрать пришлушение %d"
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr "Превратиться"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr "Создать копию"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr "Создать подчиненного"
 
@@ -2935,8 +3015,8 @@ msgstr "Создать подчиненного"
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2944,63 +3024,82 @@ msgstr "Сведения"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr "Поиск"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr "Поиск мест создания"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr "Кто бросает"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr "Коменды ГМ"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr "Поместить в крафт %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr "Послать письмо..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr "Ловить животное"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr "Принять ребенка"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "Покинуть группу?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr "Уровень: %d / %d"
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr "Уровень: Неизвестно"
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Авто. исправ. позиции"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "Тип: %s"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3535,6 +3634,11 @@ msgstr "Язык"
 msgid "Party"
 msgstr "Группа"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Не указано название группы."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3543,15 +3647,13 @@ msgstr "Обмен предметами включен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Обмен предметами выключен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Обмен предметами невозможен."
 
@@ -3562,22 +3664,19 @@ msgstr "Статус обмена предметами неизвестен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Обмен опытом включен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Обмен опытом выключен."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Обмен опытом невозможен."
 
@@ -4006,7 +4105,10 @@ msgid ""
 "Chat window will be automatically hidden when not in use.\n"
 "\n"
 "Hit Enter or hover mouse to show chat again."
-msgstr "Окно чата будет автоматически скрыто, когда не используется.\n\nНажмите Enter или наведите курсор, чтобы показать чат снова."
+msgstr ""
+"Окно чата будет автоматически скрыто, когда не используется.\n"
+"\n"
+"Нажмите Enter или наведите курсор, чтобы показать чат снова."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:58
@@ -4018,15 +4120,19 @@ msgstr "Защитить фокус чата"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
-msgstr "Включает принудительную защиту ввода в окне чата.\n\nПримечание: другие текстовые поля будут недоступны для ввода пока Вы набираете текст в окне чата."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
+msgstr ""
+"Включает принудительную защиту ввода в окне чата.\n"
+"\n"
+"Примечание: другие текстовые поля будут недоступны для ввода пока Вы "
+"набираете текст в окне чата."
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Цвета"
 
@@ -4040,7 +4146,9 @@ msgstr "Удалить цвета из полученных сообщений �
 msgid ""
 "Enable this setting to strip colors from incoming chat messages. All "
 "messages will use default chat text color if this enabled."
-msgstr "Отключает цветные сообщения чата. Если опция включена, все сообщения будут такого же цвета как и основной текст чата."
+msgstr ""
+"Отключает цветные сообщения чата. Если опция включена, все сообщения будут "
+"такого же цвета как и основной текст чата."
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:77
@@ -4050,9 +4158,11 @@ msgstr "Показать список цветов чата"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4064,7 +4174,8 @@ msgstr "Разрешить магические и администраторс�
 #: src/gui/widgets/tabs/setup_chat.cpp:92
 msgid ""
 "Enable this setting to be able to type spells and GM commands in any tab."
-msgstr "Включите эту опцию, чтобы писать заклинания и GM команды в любой вкладке."
+msgstr ""
+"Включите эту опцию, чтобы писать заклинания и GM команды в любой вкладке."
 
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_chat.cpp:98
@@ -4079,9 +4190,11 @@ msgstr "Ограничить число символов в строке чат�
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4092,7 +4205,9 @@ msgstr "Ограничить число строк в чате"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4133,8 +4248,8 @@ msgstr "Показать историю чата"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4145,9 +4260,11 @@ msgstr "Показывать информацию о подключениях в
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4158,9 +4275,11 @@ msgstr "Показывать информацию о подключениях в
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4176,9 +4295,13 @@ msgstr "Скрыть сообщения магазина"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4191,7 +4314,8 @@ msgstr "Показывать MVP сообщения"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4210,9 +4334,12 @@ msgstr "Личные сообщения во вкладках"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4223,7 +4350,8 @@ msgstr "Оставлять сообщения магии на вкладке о�
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4236,9 +4364,11 @@ msgstr "Показывать сообщения сервера на вкладк
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4263,9 +4393,11 @@ msgstr "Включить страницу чата для гм"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4276,7 +4408,8 @@ msgstr "Включить в чате закладку для языка"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4289,7 +4422,9 @@ msgstr "Показывать сообщения на всех языках"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4302,7 +4437,9 @@ msgstr "Включить вкладку боя"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4328,7 +4465,10 @@ msgstr "Подгонять размер чата"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4363,7 +4503,8 @@ msgstr "Подсвечиваемые слова (разделенные запя
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4376,7 +4517,8 @@ msgstr "Игнорировать глобальные сообщения с им
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4389,9 +4531,12 @@ msgstr "Показывать кнопку эмоций в чате"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4404,7 +4549,9 @@ msgstr "Показывать motd сообщение сервера"
 msgid ""
 "If this setting enabled, client will display server MOTD (message of the "
 "day) once you connect to server. Disable it to hide MOTD."
-msgstr "Если включена эта опция, то при подключении к серверу будет отображаться MOTD - сообщение/совет дня. Отключите, чтобы не показывать MOTD."
+msgstr ""
+"Если включена эта опция, то при подключении к серверу будет отображаться "
+"MOTD - сообщение/совет дня. Отключите, чтобы не показывать MOTD."
 
 #. TRANSLATORS: color selection preview message
 #: src/gui/widgets/tabs/setup_colors.cpp:50
@@ -4480,11 +4627,6 @@ msgid "Unassign"
 msgstr "Снять назначение"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "По умолчанию"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Сбросить все кнопки"
@@ -4505,7 +4647,9 @@ msgstr "Обнаружен(ы) конфликт(ы) клавиш."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно вести."
+msgstr ""
+"Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
+"вести."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5053,7 +5197,9 @@ msgstr "Аппаратное ускорение"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:74
 msgid "Enable opacity cache (Software, can use much memory)"
-msgstr "Включить кеш прозрачности (программный режим, может использовать много памяти)"
+msgstr ""
+"Включить кеш прозрачности (программный режим, может использовать много "
+"памяти)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:79
@@ -5083,7 +5229,9 @@ msgstr "Улучшение качества (выключите для лучш�
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:101
 msgid "Enable alpha channel fix (Software, can be very slow)"
-msgstr "Включить исправление альфа канала (программный режим, может быть очень медленным)"
+msgstr ""
+"Включить исправление альфа канала (программный режим, может быть очень "
+"медленным)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:106
@@ -5098,7 +5246,8 @@ msgstr "Включить перестановку спрайтов (нужен �
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:115
 msgid "Small memory (enable for lower memory usage)"
-msgstr "Уменьшенное потребление памяти (включите для меньшего потребления памяти)"
+msgstr ""
+"Уменьшенное потребление памяти (включите для меньшего потребления памяти)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:120
@@ -5113,7 +5262,8 @@ msgstr "Выключить кеширование сущностей (прогр
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:129
 msgid "Different options (enable or disable can improve performance)"
-msgstr "Разные настройки (включение или выключение может улучшить производительность)"
+msgstr ""
+"Разные настройки (включение или выключение может улучшить производительность)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:134
@@ -5148,7 +5298,8 @@ msgstr "Кешировать все звуки (может использова�
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:160
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
-msgstr "Очень важные настройки (НЕ МЕНЯЙТЕ если вы не уверены в том, что вы делаете)"
+msgstr ""
+"Очень важные настройки (НЕ МЕНЯЙТЕ если вы не уверены в том, что вы делаете)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:164
@@ -5553,13 +5704,17 @@ msgstr "Нет"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Не удалось переключиться в оконный режим. Восстановить старый режим также не удалось!"
+msgstr ""
+"Не удалось переключиться в оконный режим. Восстановить старый режим также не "
+"удалось!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Не удалось переключиться в полноэкранный режим. Восстановить старый режим также не удалось!"
+msgstr ""
+"Не удалось переключиться в полноэкранный режим. Восстановить старый режим "
+"также не удалось!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5600,7 +5755,9 @@ msgstr "Разрешение экрана изменено"
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:401
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем разрешении."
+msgstr ""
+"Некоторые окна могут быть сдвинуты, чтобы уместиться на экране при меньшем "
+"разрешении."
 
 #. TRANSLATORS: speach type
 #: src/gui/widgets/tabs/setup_visual.cpp:43
@@ -5769,70 +5926,70 @@ msgid "Atk"
 msgstr "Атк"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr "Приоритетные монстры"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr "Атакуемые монстры"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr "Игнорируемые монстры"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr "Друзей: %u/%u"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr "Игроков: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Пользователь %s приглашен в гильдию %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Выход из гильдии %s запрошен."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "Приглашение игрока в Гильдию"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Кого вы хотите пригласить в гильдию %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "Покинуть Гильдию?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Вы действительно хотите выйти из гильдии %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr "Членов: %u/%u"
@@ -5844,41 +6001,41 @@ msgid "Nav"
 msgstr "Нав"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr "Порталов: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Пригласить пользователя %s в группу."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Запрошен выход из группы %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "Пригласить пользователя в группу"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Кого вы хотите пригласить в группу %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "Покинуть группу?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Вы действительно хотите покинуть группу %s?"
@@ -5890,17 +6047,17 @@ msgid "Pik"
 msgstr "Подб"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr "Подбирать предметы"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr "Игнорировать предметы"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr "Видимых игроков: %d"
@@ -6133,10 +6290,8 @@ msgstr "Количество:"
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Создать"
 
@@ -6253,8 +6408,7 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6272,8 +6426,7 @@ msgstr "Распределите очки (%d)"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6299,8 +6452,7 @@ msgstr "Внешность:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr "Д"
 
@@ -6399,7 +6551,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "Hp: %u/%u\nMp: %u/%u\nУровень: %u\nОпыт: %u\nДеньги: %s"
+msgstr ""
+"Hp: %u/%u\n"
+"Mp: %u/%u\n"
+"Уровень: %u\n"
+"Опыт: %u\n"
+"Деньги: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6465,11 +6622,6 @@ msgid "Yes"
 msgstr "Да"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr "Цель"
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr "Сеть"
@@ -6501,8 +6653,7 @@ msgstr "Редактирование сервера"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Соединиться"
 
@@ -6571,8 +6722,8 @@ msgstr "Шрифты"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr "Неизвестный"
 
@@ -6872,15 +7023,13 @@ msgstr "Заголовок:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr "Деньги:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr "Премет:"
@@ -7282,173 +7431,138 @@ msgid "Up"
 msgstr "Верх"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Очков навыков осталось: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr "Навык %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "Навык %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Уровень: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Неудача навыка: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr "Добавить текст к скилу %s"
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr "Текст: "
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr "И"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "Пригласить"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Принято приглашение в группу от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Отклонено приглашение в группу от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Принято приглашение в гильдию от %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Отклонено приглашение в гильдию от %s."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Создание гильдии с именем %s."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "Создание группы с именем %s."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "Имя гильдии"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "Выберите имя для гильдии."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr "Получено приглашение в гильдию, но оно не первое."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s приглашает присоединиться к гильдии %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "Принять приглашение в гильдию"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "Получено приглашение в группу, но оно не первое."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "Вас приглашают в группу."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Вас приглашают присоединиться к группе %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s приглашает Вас к себе в группу."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s приглашает присоединиться к %s группе."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "Принять приглашение в группу"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "Не удалось создать группу. Вы уже состоите в другой."
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "Имя группы"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "Выберите имя будущей группы."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7588,9 +7702,10 @@ msgstr "У вас недостаточно денег."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид объектов более одного раза."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
+"объектов более одного раза."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -7675,25 +7790,25 @@ msgstr "Выберите сервер"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "кнопка_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr "КнопДж%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr "неизвестная кнопка"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr "ДЖ%d"
@@ -7701,7 +7816,7 @@ msgstr "ДЖ%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "неиз."
 
@@ -8844,7 +8959,8 @@ msgstr "Очистить окно бросания"
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:50
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr "В доступе отказано. Скорее всего, на этом сервере слишком много игроков."
+msgstr ""
+"В доступе отказано. Скорее всего, на этом сервере слишком много игроков."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:55
@@ -8859,7 +8975,8 @@ msgstr "Неизвестная ошибка сервера персонажей.
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Невозможно создать персонажа. Скорее всего, такое имя уже используется."
+msgstr ""
+"Невозможно создать персонажа. Скорее всего, такое имя уже используется."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:160
@@ -9017,7 +9134,8 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум."
+msgstr ""
+"Вас забанили до %s. Пожалуйста, свяжитесь с командой ГМ-ов через форум."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10111,7 +10229,8 @@ msgstr "Ошибка перемещения денег в банк. Возмож
 msgid ""
 "Withdraw failed. You probably don't have this amount of money in the bank "
 "right now."
-msgstr "Ошибка перемещения денег из банка. Возможно у вас нет столько денег в банке."
+msgstr ""
+"Ошибка перемещения денег из банка. Возможно у вас нет столько денег в банке."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:432
@@ -10153,7 +10272,9 @@ msgstr "Сделка провалена."
 msgid ""
 "The trade failed, because the entered amount of item is higher, than the "
 "buyer is willing to buy."
-msgstr "Сделка провалена потому, что указанное количество больще чем покупатель хочет купить."
+msgstr ""
+"Сделка провалена потому, что указанное количество больще чем покупатель "
+"хочет купить."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:465
@@ -10476,7 +10597,8 @@ msgstr "Ошибка игнорирования игрока."
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:718
 msgid "Player ignore failed. Because too many ignores."
-msgstr "Ошибка игнорирования игрока потому, что слишком много игнорируемых игроков."
+msgstr ""
+"Ошибка игнорирования игрока потому, что слишком много игнорируемых игроков."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:722
@@ -10569,7 +10691,8 @@ msgstr "Ошибка принятия ребенка. Ваш уровень сл
 #: src/resources/notifications.h:816
 msgid ""
 "Child adoption failed. This player is already married and can't be a baby."
-msgstr "Ошибка принятия ребенка: этот игрок уже женат, и не может быть ребенком."
+msgstr ""
+"Ошибка принятия ребенка: этот игрок уже женат, и не может быть ребенком."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:821
@@ -10587,30 +10710,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr "Ошибка сохранения позиции. У вас нет умения телепортации."
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr "Ур.: %d / %d"
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr "Неизвестно:"
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr " / Мана: -%d"
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr "Дистанция: %d"
@@ -10621,11 +10744,6 @@ msgid "Ground"
 msgstr "Земля"
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr "Сам"
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr "Не использован"
@@ -10644,7 +10762,9 @@ msgstr "Ловушка"
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или \"0\"."
+msgstr ""
+"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
+"\"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10700,3 +10820,30 @@ msgstr "%d секунда"
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Не задано имя гильдии."
+
+#~ msgid "Invite"
+#~ msgstr "Пригласить"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "Создание гильдии с именем %s."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "Создание группы с именем %s."
+
+#~ msgid "Guild Name"
+#~ msgstr "Имя гильдии"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "Выберите имя для гильдии."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "Не удалось создать группу. Вы уже состоите в другой."
+
+#~ msgid "Party Name"
+#~ msgstr "Имя группы"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "Выберите имя будущей группы."
diff --git a/po/sr.po b/po/sr.po
index 0576ffe1a..3dd43661d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Aleksandar Djokic <inactive+Cyberdjox@transifex.com>, 2013
 # Aleksandar Djokic <inactive+Cyberdjox@transifex.com>, 2013
@@ -9,15 +9,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/sr/)\n"
+"Language-Team: Serbian (http://www.transifex.com/akaras/manaplus/language/"
+"sr/)\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
 #: src/actions/actions.cpp:164
@@ -30,7 +32,6 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -50,10 +51,9 @@ msgstr ""
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -102,80 +102,85 @@ msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
 msgstr ""
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Nedostaje ime partije."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Partija ciljanog igrača:"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Nedostaje ime udruženja."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Udruženje ciljanog igrača:"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Definiši ime."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "\"Enter\" uključuje ili isključuje ćaskanje."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "Poruka zatvara ćaskanje."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "\"Enter\" sada uključuje ili isključuje ćaskanje."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "Poruka sada zatvara ćaskanje."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -450,8 +455,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr ""
 
@@ -535,8 +540,8 @@ msgstr "Pomoć"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -1238,15 +1243,14 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
 #. TRANSLATORS: weight message
@@ -1263,8 +1267,7 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "standardno"
 
@@ -1425,8 +1428,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr ""
 
@@ -1732,8 +1735,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1752,58 +1755,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr ""
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr ""
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1825,7 +1776,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1839,8 +1790,8 @@ msgstr "Trgovanje"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr ""
@@ -1851,36 +1802,36 @@ msgstr ""
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr ""
 
@@ -1888,7 +1839,7 @@ msgstr ""
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr ""
 
@@ -1905,9 +1856,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr ""
@@ -1916,7 +1867,7 @@ msgstr ""
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr ""
@@ -1931,7 +1882,7 @@ msgstr ""
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1949,7 +1900,7 @@ msgstr ""
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1961,26 +1912,26 @@ msgstr ""
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:320
+#: src/gui/popups/popupmenu.cpp:321
 msgid "Add to priority attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr ""
 
@@ -1988,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:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr ""
 
@@ -2008,7 +1959,7 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr ""
 
@@ -2018,8 +1969,8 @@ msgstr ""
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr ""
@@ -2028,13 +1979,13 @@ msgstr ""
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr ""
 
@@ -2042,7 +1993,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2055,7 +2006,7 @@ msgstr "Skini"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr ""
 
@@ -2063,39 +2014,88 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr ""
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Igrači"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Dodaj u prozor za ćaskanje"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr ""
 
@@ -2105,28 +2105,28 @@ msgstr ""
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr ""
 
@@ -2135,7 +2135,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2143,69 +2143,68 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr ""
 
@@ -2215,116 +2214,116 @@ msgstr ""
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 msgid "Rename map sign          "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "Ime:                     "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1745
+#: src/gui/popups/popupmenu.cpp:1762
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1767
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1771
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr ""
 
@@ -2333,8 +2332,8 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2342,63 +2341,63 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "Sačuvaj 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "Sačuvaj pola"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Sačuvaj sve"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "Uzmi 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 msgid "Retrieve half"
 msgstr "Uzmi pola"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Uzmi sve"
 
@@ -2409,17 +2408,17 @@ msgstr "Uzmi sve"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr ""
 
@@ -2428,43 +2427,43 @@ msgstr ""
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr ""
 
@@ -2472,175 +2471,245 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Pozicija igrača:"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 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:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr ""
 
@@ -2648,38 +2717,38 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr ""
 
@@ -2688,7 +2757,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2697,7 +2766,7 @@ msgstr "Lista predmeta"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr ""
 
@@ -2706,7 +2775,7 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2715,31 +2784,31 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Komande"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr ""
 
@@ -2747,7 +2816,7 @@ msgstr ""
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr ""
 
@@ -2755,109 +2824,109 @@ msgstr ""
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2865,31 +2934,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2898,19 +2967,19 @@ msgstr ""
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2922,8 +2991,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2931,63 +3000,81 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+msgid "Leave party"
+msgstr ""
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr ""
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Pozicija igrača:"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, c-format
+msgid "Cast type: %s"
+msgstr ""
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3522,6 +3609,11 @@ msgstr ""
 msgid "Party"
 msgstr ""
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Nedostaje ime partije."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3530,15 +3622,13 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3549,22 +3639,19 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4005,15 +4092,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Boje"
 
@@ -4037,9 +4124,11 @@ msgstr "Prikaži listu boja za ćaskanje"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4066,9 +4155,11 @@ msgstr "Ograniči maksimalan broj karaktera u jednoj liniji za ćaskanje"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4079,7 +4170,9 @@ msgstr "Ograniči maksimalan broj linija za ćaskanje"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4120,8 +4213,8 @@ msgstr "Prikaži istoriju ćaskanja"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4132,9 +4225,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4145,9 +4240,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4163,9 +4260,13 @@ msgstr "Sakrij poruke prodavnica"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4178,7 +4279,8 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4197,9 +4299,12 @@ msgstr "Stavi sva šaputanja u kartice"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4210,7 +4315,8 @@ msgstr "Spasi poruke vezane za magiju u debug kartici"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4223,9 +4329,11 @@ msgstr "Prikaži serverske poruke na debug kartici"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4250,9 +4358,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4263,7 +4373,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4276,7 +4387,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4289,7 +4402,9 @@ msgstr "Uključi karticu za bitku"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4315,7 +4430,10 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4350,7 +4468,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4363,7 +4482,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4376,9 +4496,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4467,11 +4590,6 @@ msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr ""
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr ""
@@ -4492,7 +4610,9 @@ msgstr ""
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Konflikt tastera između \"%s\" i \"%s\". Treba da se reši ovo, u suprotnom tok igre će biti čudan i nedefinisan."
+msgstr ""
+"Konflikt tastera između \"%s\" i \"%s\". Treba da se reši ovo, u suprotnom "
+"tok igre će biti čudan i nedefinisan."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5756,70 +5876,70 @@ msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
@@ -5831,41 +5951,41 @@ msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
@@ -5877,17 +5997,17 @@ msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
@@ -6120,10 +6240,8 @@ msgstr ""
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr ""
 
@@ -6240,8 +6358,7 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ""
 
@@ -6259,8 +6376,7 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr ""
 
@@ -6286,8 +6402,7 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr ""
 
@@ -6452,11 +6567,6 @@ msgid "Yes"
 msgstr "Da"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr ""
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr ""
@@ -6488,8 +6598,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Koncija"
 
@@ -6558,8 +6667,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr ""
 
@@ -6857,15 +6966,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7267,173 +7374,138 @@ msgid "Up"
 msgstr ""
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Odbijen partijski poziv od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Prihvaćen poziv za udruženje od %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Odbijen poziv za udruženje od %s."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Kreiranje udruženja pod nazivom %s."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "Kreiranje partije pod nazivom %s."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "Ime Udruženja"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "Izaberi ime svog udruženja."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr "Primljen zahtev za udruženje, ali već postoji jedan."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te je pozvao da se pridružiš udruženju %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "Prihvati poziv za udruženje"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "Primljen zahtev za partiju, ali već postoji jedan."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "Pozvan si da se pridružiš partiji."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Pozvan si da se pridružiš partiji pod imenom %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te je pozvao da se pridružiš njihovoj partiji."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te je pozvao da se pridružiš %s partiji."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "Prihvati zahtev za partiju"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "Nije moguće napraviti partiju. Već se nalaziš u jednoj."
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "Ime partije"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "Izaberi ime svoje partije."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7573,8 +7645,7 @@ msgstr ""
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
 #. TRANSLATORS: trade error
@@ -7660,25 +7731,25 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7686,7 +7757,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -10572,30 +10643,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr ""
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -10606,11 +10677,6 @@ msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr ""
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr ""
@@ -10685,3 +10751,27 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr ""
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Nedostaje ime udruženja."
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "Kreiranje udruženja pod nazivom %s."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "Kreiranje partije pod nazivom %s."
+
+#~ msgid "Guild Name"
+#~ msgstr "Ime Udruženja"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "Izaberi ime svog udruženja."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "Nije moguće napraviti partiju. Već se nalaziš u jednoj."
+
+#~ msgid "Party Name"
+#~ msgstr "Ime partije"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "Izaberi ime svoje partije."
diff --git a/po/sv.po b/po/sv.po
index 2887f550b..97b02cab7 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Kristoffer Frisell <kristoffer@frisell.it>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/language/sv_SE/)\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
+"language/sv_SE/)\n"
+"Language: sv_SE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv_SE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -29,7 +30,6 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -49,10 +49,9 @@ msgstr ""
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -101,80 +100,85 @@ msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
 msgstr ""
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Gruppnamn saknas."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Skapa Party"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Guild-namn saknas."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Target guild:"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Var vänlig specificera ett namn."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "Enter för att växla chat."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "Meddelande stänger chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "Enter nu, växlar chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "Meddelande nu, stänger chat."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -448,8 +452,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -533,8 +537,8 @@ msgstr "Hjälp"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -671,7 +675,8 @@ msgstr "  -h --help           : Visa hjälp"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Konfiguration för vilken katalog som ska användas"
+msgstr ""
+"  -C --config-dir     : Konfiguration för vilken katalog som ska användas"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:68
@@ -746,7 +751,9 @@ msgstr ""
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --tests          : Börja testning av drivrutiner och automat-configurering"
+msgstr ""
+"  -T --tests          : Börja testning av drivrutiner och automat-"
+"configurering"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -1236,15 +1243,14 @@ msgstr "Meddelande"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr "Återuppliva"
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "Du bär på mer än halva din vikt. Du kan inte återfå health."
 
 #. TRANSLATORS: weight message
@@ -1261,8 +1267,7 @@ msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "standard"
 
@@ -1423,8 +1428,8 @@ msgstr "Skitstor (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1730,8 +1735,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1750,58 +1755,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "Skapa Party"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "Avbryt"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1823,7 +1776,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1837,8 +1790,8 @@ msgstr "Trade"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "Attackera"
@@ -1849,36 +1802,36 @@ msgstr "Attackera"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "Viska"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "Hela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "Kicka från guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 msgid "Change pos in guild"
 msgstr "Ändra position i guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "Bjud in till guild"
 
@@ -1886,7 +1839,7 @@ msgstr "Bjud in till guild"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1903,9 +1856,9 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "Flytta"
@@ -1914,7 +1867,7 @@ msgstr "Flytta"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Prata med"
@@ -1929,7 +1882,7 @@ msgstr "Prata med"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1947,7 +1900,7 @@ msgstr "Köp"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1959,26 +1912,26 @@ msgstr "Sälj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 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:320
+#: src/gui/popups/popupmenu.cpp:321
 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:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "Lägg till i attacklistan"
 
@@ -1986,19 +1939,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:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 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:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr ""
 
@@ -2006,7 +1959,7 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr ""
 
@@ -2016,8 +1969,8 @@ msgstr ""
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "Ändra namn"
@@ -2026,13 +1979,13 @@ msgstr "Ändra namn"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr ""
 
@@ -2040,7 +1993,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2053,7 +2006,7 @@ msgstr "Unequip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr ""
 
@@ -2061,39 +2014,88 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "Lägg till namnet i chat"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "Avbryt"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Kicka från party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "Pick up"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "Kartobjekt"
 
@@ -2103,28 +2105,28 @@ msgstr "Kartobjekt"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr "Warpa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr "Rör kamera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr ""
 
@@ -2133,7 +2135,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2141,69 +2143,68 @@ msgstr "Utstyrsel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr "Rensa klädsel"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 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:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "Clear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "Inaktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr "Aktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 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:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "Ta bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "Aktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 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:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "Lämna"
 
@@ -2213,116 +2214,116 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "Ändra guild-position"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 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:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "Namn:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 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:1745
+#: src/gui/popups/popupmenu.cpp:1762
 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:1750
+#: src/gui/popups/popupmenu.cpp:1767
 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:1754
+#: src/gui/popups/popupmenu.cpp:1771
 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:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr "Lägg till alla för trade"
 
@@ -2331,8 +2332,8 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2340,63 +2341,63 @@ msgstr "Lagra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "Lagra 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "Lagra hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr "Lagra alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Lagra alla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "Ta emot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "Hämta ut 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 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:1826
+#: src/gui/popups/popupmenu.cpp:1843
 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:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Hämta ut alla"
 
@@ -2407,17 +2408,17 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
@@ -2426,43 +2427,43 @@ msgstr "Rensa drop-fönster"
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 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:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2470,175 +2471,245 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr "Visa fönster"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "Default"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr "Target"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Auto-fix position"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 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:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 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:2717
+#: src/gui/popups/popupmenu.cpp:2833
 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:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -2646,38 +2717,38 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Släng"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr ""
 
@@ -2686,7 +2757,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2695,7 +2766,7 @@ msgstr "Inventory"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr "Storage"
 
@@ -2704,7 +2775,7 @@ msgstr "Storage"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2713,31 +2784,31 @@ msgstr "Cart"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Kommando"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr "Granska ip"
 
@@ -2745,7 +2816,7 @@ msgstr "Granska ip"
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr "Goto"
 
@@ -2753,109 +2824,109 @@ msgstr "Goto"
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2863,31 +2934,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr "Sparka"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2896,19 +2967,19 @@ msgstr ""
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2920,8 +2991,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2929,63 +3000,82 @@ msgstr "Info"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "Lämna Party?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr ""
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Auto-fix position"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "Target-typ:"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3520,6 +3610,11 @@ msgstr "Lang"
 msgid "Party"
 msgstr "Party"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Gruppnamn saknas."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3528,15 +3623,13 @@ msgstr "Item-delning aktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Item-delning avaktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Item-delning är inte möjlig."
 
@@ -3547,22 +3640,19 @@ msgstr "Item-delning okänd."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Exp-delning är aktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Exp-delning avaktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Exp-delning är inte möjlig."
 
@@ -4003,15 +4093,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Färger"
 
@@ -4035,9 +4125,11 @@ msgstr "Visa chat-färglistan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4064,9 +4156,11 @@ msgstr "Begränsa max-tecken i chatten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4077,7 +4171,9 @@ msgstr "Begränsa max-rader i chatten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4118,8 +4214,8 @@ msgstr "Visa chat-historik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4130,9 +4226,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4143,9 +4241,11 @@ msgstr "Visa online-meddelande för guild"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4161,9 +4261,13 @@ msgstr "Dölj shop-meddelanden"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4176,7 +4280,8 @@ msgstr "Visa MVP-meddelanden"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4195,9 +4300,12 @@ msgstr "Lägg alla viskningar i flikar"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4208,7 +4316,8 @@ msgstr "Logga magic messages i log-tabben"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4221,9 +4330,11 @@ msgstr "Visa servermeddelanden i log-fliken"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4248,9 +4359,11 @@ msgstr "Aktivera GM-flik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4261,7 +4374,8 @@ msgstr "Aktivera språk-flik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4274,7 +4388,9 @@ msgstr "Visa alla språk-meddelanden"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4287,7 +4403,9 @@ msgstr "Aktivera battle-flik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4313,7 +4431,10 @@ msgstr "Ändra storlek på chat-flikarna om det behövs"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4348,7 +4469,8 @@ msgstr "Highlighta ord (separerat med komma)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4361,7 +4483,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4374,9 +4497,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4465,11 +4591,6 @@ msgid "Unassign"
 msgstr "Ta bort tilldelning"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "Default"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Återställ alla tangenter"
@@ -4490,7 +4611,9 @@ msgstr "Tangent-konflikt(er) uppmärksammade."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Konflikt mellan knapparna \"%s\" och \"%s\". Om detta inte löses kan spelet uppföra sig konstigt."
+msgstr ""
+"Konflikt mellan knapparna \"%s\" och \"%s\". Om detta inte löses kan spelet "
+"uppföra sig konstigt."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -4875,7 +4998,8 @@ msgstr "Bots support"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Enable guild bot support and disable native guild support"
-msgstr "Aktivera support för guild-bot och avaktivera grund-supporten för guild"
+msgstr ""
+"Aktivera support för guild-bot och avaktivera grund-supporten för guild"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:313
@@ -5538,13 +5662,17 @@ msgstr "Ingen"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Misslyckades att ändra till fönster-läge och återställandet av det gamla läget misslyckades också!"
+msgstr ""
+"Misslyckades att ändra till fönster-läge och återställandet av det gamla "
+"läget misslyckades också!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Misslyckades att ändra till fullskärms-läge och återställandet av det gamla läget misslyckades också!"
+msgstr ""
+"Misslyckades att ändra till fullskärms-läge och återställandet av det gamla "
+"läget misslyckades också!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5754,70 +5882,70 @@ msgid "Atk"
 msgstr "Atk"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr "Prioriterings-mobs"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr "Attackera mobs"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr "Ignorera mobs"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr "Vänner: %u/%u"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr "Spelare: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Bjud in användare %s till guilden %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Guild %s avslutning förfrågad."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "Medlem bjuder in till Guild"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Vem vill du bjuda in till guild %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "Lämna Guild?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Är du säker på att du vill lämna guild %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr "Medlemmar: %u/%u"
@@ -5829,41 +5957,41 @@ msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr "Portaler: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Bjud in spelare %s till party."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Party %s avslutning förfrågad."
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "Medlem bjuder in till Party"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Vem vill du bjuda in till party %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "Lämna Party?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Är du säker på att du vill lämna party %s?"
@@ -5875,17 +6003,17 @@ msgid "Pik"
 msgstr "Pik"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr "Pickupa items"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr "Ignorera items"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr "Synliga spelare: %d"
@@ -6118,10 +6246,8 @@ msgstr "Antal:"
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Skapa"
 
@@ -6238,8 +6364,7 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6257,8 +6382,7 @@ msgstr "Vänligen distribuera %d poäng"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6284,8 +6408,7 @@ msgstr "Utseende:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr "F"
 
@@ -6384,7 +6507,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "Hp: %u/%u⏎\nMp: %u/%u⏎\nLevel: %u⏎\nExperience: %u⏎\nMoney: %s"
+msgstr ""
+"Hp: %u/%u⏎\n"
+"Mp: %u/%u⏎\n"
+"Level: %u⏎\n"
+"Experience: %u⏎\n"
+"Money: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6450,11 +6578,6 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr "Target"
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr "Nät"
@@ -6486,8 +6609,7 @@ msgstr "Editera Server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Anslut"
 
@@ -6529,7 +6651,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog error message
 #: src/gui/windows/editserverdialog.cpp:206
 msgid "Please at least type both the address and the port of the server."
-msgstr "Snälla, kan du inte bara vara vänlig och skriva in både adress och port till servern."
+msgstr ""
+"Snälla, kan du inte bara vara vänlig och skriva in både adress och port till "
+"servern."
 
 #. TRANSLATORS: egg selection dialog name
 #: src/gui/windows/eggselectiondialog.cpp:42
@@ -6556,8 +6680,8 @@ msgstr "Fonter"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr ""
 
@@ -6853,15 +6977,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7263,173 +7385,138 @@ msgid "Up"
 msgstr "Upp"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Skill points tillgängliga: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr "Skill Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "Bjud in"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accepterad party-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Nekad party-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accepterad guild-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Nekad guild-inbjudning från %s."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Skapar guilden %s."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "Skapar partyt %s."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "Guild-namn"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "Välj ditt guild-namn."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr "Tog emot guild-request, då ett redan existerar."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s har bjudit in dig att joina guilden %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "Acceptera Guild-inbjudningar"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "Tog emot party-request, även om ett redan existerar."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "Du har blivit inbjuden att joina ett party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Du har blivit inbjuden att joina %s party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har bjudit in dig att joina deras party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har bjudit in dig att joina %s party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "Acceptera Party-invite"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "Kan inte skapa party. Du är redan i ett party"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "Party-namn"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "Välj ditt party-namn."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7569,9 +7656,10 @@ msgstr "Du har inte tillräckligt med pengar."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i fönstret."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i "
+"fönstret."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -7656,25 +7744,25 @@ msgstr "Välj värld"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr "okänd eller borttappad tangent"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7682,7 +7770,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u-tangenten"
 
@@ -8840,7 +8928,9 @@ msgstr ""
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är taget."
+msgstr ""
+"Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är "
+"taget."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:160
@@ -8983,7 +9073,8 @@ msgstr "Nekad från servern."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
+msgstr ""
+"Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -8998,7 +9089,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Du har blivit temporärt bannad från spelet tills %s.⏎ Vänligen kontakta GM-teamet via forumet."
+msgstr ""
+"Du har blivit temporärt bannad från spelet tills %s.⏎ Vänligen kontakta GM-"
+"teamet via forumet."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10568,30 +10661,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr ""
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -10602,11 +10695,6 @@ msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr ""
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr ""
@@ -10625,7 +10713,9 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Valmöjligheter till /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Valmöjligheter till /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", "
+"\"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10681,3 +10771,30 @@ msgstr "%d sekund"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Guild-namn saknas."
+
+#~ msgid "Invite"
+#~ msgstr "Bjud in"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "Skapar guilden %s."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "Skapar partyt %s."
+
+#~ msgid "Guild Name"
+#~ msgstr "Guild-namn"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "Välj ditt guild-namn."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "Kan inte skapa party. Du är redan i ett party"
+
+#~ msgid "Party Name"
+#~ msgstr "Party-namn"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "Välj ditt party-namn."
diff --git a/po/sv_SE.po b/po/sv_SE.po
index 2887f550b..97b02cab7 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -1,21 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Kristoffer Frisell <kristoffer@frisell.it>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/language/sv_SE/)\n"
+"Language-Team: Swedish (Sweden) (http://www.transifex.com/akaras/manaplus/"
+"language/sv_SE/)\n"
+"Language: sv_SE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv_SE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -29,7 +30,6 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -49,10 +49,9 @@ msgstr ""
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -101,80 +100,85 @@ msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
 msgstr ""
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Gruppnamn saknas."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Skapa Party"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Guild-namn saknas."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Target guild:"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Var vänlig specificera ett namn."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "Enter för att växla chat."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "Meddelande stänger chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "Enter nu, växlar chat."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "Meddelande nu, stänger chat."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -448,8 +452,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "Fullständigt ignorera"
 
@@ -533,8 +537,8 @@ msgstr "Hjälp"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -671,7 +675,8 @@ msgstr "  -h --help           : Visa hjälp"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Konfiguration för vilken katalog som ska användas"
+msgstr ""
+"  -C --config-dir     : Konfiguration för vilken katalog som ska användas"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:68
@@ -746,7 +751,9 @@ msgstr ""
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:112
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr "  -T --tests          : Börja testning av drivrutiner och automat-configurering"
+msgstr ""
+"  -T --tests          : Börja testning av drivrutiner och automat-"
+"configurering"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:118
@@ -1236,15 +1243,14 @@ msgstr "Meddelande"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr "Återuppliva"
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "Du bär på mer än halva din vikt. Du kan inte återfå health."
 
 #. TRANSLATORS: weight message
@@ -1261,8 +1267,7 @@ msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "standard"
 
@@ -1423,8 +1428,8 @@ msgstr "Skitstor (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(standard)"
 
@@ -1730,8 +1735,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1750,58 +1755,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "Skapa Party"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "Avbryt"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1823,7 +1776,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1837,8 +1790,8 @@ msgstr "Trade"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "Attackera"
@@ -1849,36 +1802,36 @@ msgstr "Attackera"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "Viska"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "Hela"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "Kicka från guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 msgid "Change pos in guild"
 msgstr "Ändra position i guild"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "Bjud in till guild"
 
@@ -1886,7 +1839,7 @@ msgstr "Bjud in till guild"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1903,9 +1856,9 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "Flytta"
@@ -1914,7 +1867,7 @@ msgstr "Flytta"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Prata med"
@@ -1929,7 +1882,7 @@ msgstr "Prata med"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1947,7 +1900,7 @@ msgstr "Köp"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1959,26 +1912,26 @@ msgstr "Sälj"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr ""
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 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:320
+#: src/gui/popups/popupmenu.cpp:321
 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:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "Lägg till i attacklistan"
 
@@ -1986,19 +1939,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:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 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:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr ""
 
@@ -2006,7 +1959,7 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr ""
 
@@ -2016,8 +1969,8 @@ msgstr ""
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "Ändra namn"
@@ -2026,13 +1979,13 @@ msgstr "Ändra namn"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr ""
 
@@ -2040,7 +1993,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2053,7 +2006,7 @@ msgstr "Unequip"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr ""
 
@@ -2061,39 +2014,88 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "Lägg till namnet i chat"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "Avbryt"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Kicka från party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "Pick up"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Lägg till i chat"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "Kartobjekt"
 
@@ -2103,28 +2105,28 @@ msgstr "Kartobjekt"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr "Warpa"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr "Rör kamera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr ""
 
@@ -2133,7 +2135,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2141,69 +2143,68 @@ msgstr "Utstyrsel"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr "Rensa klädsel"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Spells"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 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:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "Clear"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "Inaktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr "Aktivera highlight"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 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:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "Ta bort namn"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "Aktivera away"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 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:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "Lämna"
 
@@ -2213,116 +2214,116 @@ msgstr "Lämna"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr "Kopiera till clipboard"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "Ändra guild-position"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr "Spelare"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 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:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "Namn:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr ""
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 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:1745
+#: src/gui/popups/popupmenu.cpp:1762
 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:1750
+#: src/gui/popups/popupmenu.cpp:1767
 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:1754
+#: src/gui/popups/popupmenu.cpp:1771
 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:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr "Lägg till alla för trade"
 
@@ -2331,8 +2332,8 @@ msgstr "Lägg till alla för trade"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2340,63 +2341,63 @@ msgstr "Lagra"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "Lagra 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "Lagra hälften"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr "Lagra alla-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Lagra alla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "Ta emot"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "Hämta ut 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 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:1826
+#: src/gui/popups/popupmenu.cpp:1843
 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:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Hämta ut alla"
 
@@ -2407,17 +2408,17 @@ msgstr "Hämta ut alla"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Använd"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr "Rensa drop-fönster"
 
@@ -2426,43 +2427,43 @@ msgstr "Rensa drop-fönster"
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "Döjl"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "Visa"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 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:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr "Kopiera till chat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "Flytta upp"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr "Flytta ner"
 
@@ -2470,175 +2471,245 @@ msgstr "Flytta ner"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr "Klä av"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr "Kopiera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr "Klistra in"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr "Öppna länk"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr "Visa fönster"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "Default"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr "Target"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Auto-fix position"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 msgid "Disregard"
 msgstr "Ignorera"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 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:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr "Black list"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr "Sätt som enemy"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr "Ta bort"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "Bli vän"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "Av-ignorera"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "Follow"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "Köp (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "Sälj (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "Bjud in till party"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "Visa Items"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 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:2717
+#: src/gui/popups/popupmenu.cpp:2833
 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:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr "Skydda inte item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr "Skydda item"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Släng..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "Släng allt"
 
@@ -2646,38 +2717,38 @@ msgstr "Släng allt"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Släng"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr ""
 
@@ -2686,7 +2757,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2695,7 +2766,7 @@ msgstr "Inventory"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr "Storage"
 
@@ -2704,7 +2775,7 @@ msgstr "Storage"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2713,31 +2784,31 @@ msgstr "Cart"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Kommando"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr "Granska ip"
 
@@ -2745,7 +2816,7 @@ msgstr "Granska ip"
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr "Goto"
 
@@ -2753,109 +2824,109 @@ msgstr "Goto"
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr "Återkalla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2863,31 +2934,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr "Sparka"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2896,19 +2967,19 @@ msgstr ""
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2920,8 +2991,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2929,63 +3000,82 @@ msgstr "Info"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr "GM-kommandon"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "Lämna Party?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr ""
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Auto-fix position"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "Target-typ:"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3520,6 +3610,11 @@ msgstr "Lang"
 msgid "Party"
 msgstr "Party"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Gruppnamn saknas."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3528,15 +3623,13 @@ msgstr "Item-delning aktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Item-delning avaktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Item-delning är inte möjlig."
 
@@ -3547,22 +3640,19 @@ msgstr "Item-delning okänd."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Exp-delning är aktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Exp-delning avaktiverad."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Exp-delning är inte möjlig."
 
@@ -4003,15 +4093,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Färger"
 
@@ -4035,9 +4125,11 @@ msgstr "Visa chat-färglistan"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4064,9 +4156,11 @@ msgstr "Begränsa max-tecken i chatten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4077,7 +4171,9 @@ msgstr "Begränsa max-rader i chatten"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4118,8 +4214,8 @@ msgstr "Visa chat-historik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4130,9 +4226,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4143,9 +4241,11 @@ msgstr "Visa online-meddelande för guild"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4161,9 +4261,13 @@ msgstr "Dölj shop-meddelanden"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4176,7 +4280,8 @@ msgstr "Visa MVP-meddelanden"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4195,9 +4300,12 @@ msgstr "Lägg alla viskningar i flikar"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4208,7 +4316,8 @@ msgstr "Logga magic messages i log-tabben"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4221,9 +4330,11 @@ msgstr "Visa servermeddelanden i log-fliken"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4248,9 +4359,11 @@ msgstr "Aktivera GM-flik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4261,7 +4374,8 @@ msgstr "Aktivera språk-flik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4274,7 +4388,9 @@ msgstr "Visa alla språk-meddelanden"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4287,7 +4403,9 @@ msgstr "Aktivera battle-flik"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4313,7 +4431,10 @@ msgstr "Ändra storlek på chat-flikarna om det behövs"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4348,7 +4469,8 @@ msgstr "Highlighta ord (separerat med komma)"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4361,7 +4483,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4374,9 +4497,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4465,11 +4591,6 @@ msgid "Unassign"
 msgstr "Ta bort tilldelning"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "Default"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Återställ alla tangenter"
@@ -4490,7 +4611,9 @@ msgstr "Tangent-konflikt(er) uppmärksammade."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Konflikt mellan knapparna \"%s\" och \"%s\". Om detta inte löses kan spelet uppföra sig konstigt."
+msgstr ""
+"Konflikt mellan knapparna \"%s\" och \"%s\". Om detta inte löses kan spelet "
+"uppföra sig konstigt."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -4875,7 +4998,8 @@ msgstr "Bots support"
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Enable guild bot support and disable native guild support"
-msgstr "Aktivera support för guild-bot och avaktivera grund-supporten för guild"
+msgstr ""
+"Aktivera support för guild-bot och avaktivera grund-supporten för guild"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:313
@@ -5538,13 +5662,17 @@ msgstr "Ingen"
 #: src/gui/widgets/tabs/setup_video.cpp:233
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Misslyckades att ändra till fönster-läge och återställandet av det gamla läget misslyckades också!"
+msgstr ""
+"Misslyckades att ändra till fönster-läge och återställandet av det gamla "
+"läget misslyckades också!"
 
 #. TRANSLATORS: video error message
 #: src/gui/widgets/tabs/setup_video.cpp:240
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Misslyckades att ändra till fullskärms-läge och återställandet av det gamla läget misslyckades också!"
+msgstr ""
+"Misslyckades att ändra till fullskärms-läge och återställandet av det gamla "
+"läget misslyckades också!"
 
 #. TRANSLATORS: video settings warning
 #: src/gui/widgets/tabs/setup_video.cpp:253
@@ -5754,70 +5882,70 @@ msgid "Atk"
 msgstr "Atk"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr "Prioriterings-mobs"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr "Attackera mobs"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr "Ignorera mobs"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr "Vänner: %u/%u"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr "Spelare: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Bjud in användare %s till guilden %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Guild %s avslutning förfrågad."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "Medlem bjuder in till Guild"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Vem vill du bjuda in till guild %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "Lämna Guild?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Är du säker på att du vill lämna guild %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr "Medlemmar: %u/%u"
@@ -5829,41 +5957,41 @@ msgid "Nav"
 msgstr "Nav"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr "Portaler: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Bjud in spelare %s till party."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Party %s avslutning förfrågad."
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "Medlem bjuder in till Party"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Vem vill du bjuda in till party %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "Lämna Party?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Är du säker på att du vill lämna party %s?"
@@ -5875,17 +6003,17 @@ msgid "Pik"
 msgstr "Pik"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr "Pickupa items"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr "Ignorera items"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr "Synliga spelare: %d"
@@ -6118,10 +6246,8 @@ msgstr "Antal:"
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Skapa"
 
@@ -6238,8 +6364,7 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6257,8 +6382,7 @@ msgstr "Vänligen distribuera %d poäng"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6284,8 +6408,7 @@ msgstr "Utseende:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr "F"
 
@@ -6384,7 +6507,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "Hp: %u/%u⏎\nMp: %u/%u⏎\nLevel: %u⏎\nExperience: %u⏎\nMoney: %s"
+msgstr ""
+"Hp: %u/%u⏎\n"
+"Mp: %u/%u⏎\n"
+"Level: %u⏎\n"
+"Experience: %u⏎\n"
+"Money: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6450,11 +6578,6 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr "Target"
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr "Nät"
@@ -6486,8 +6609,7 @@ msgstr "Editera Server"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Anslut"
 
@@ -6529,7 +6651,9 @@ msgstr ""
 #. TRANSLATORS: edit server dialog error message
 #: src/gui/windows/editserverdialog.cpp:206
 msgid "Please at least type both the address and the port of the server."
-msgstr "Snälla, kan du inte bara vara vänlig och skriva in både adress och port till servern."
+msgstr ""
+"Snälla, kan du inte bara vara vänlig och skriva in både adress och port till "
+"servern."
 
 #. TRANSLATORS: egg selection dialog name
 #: src/gui/windows/eggselectiondialog.cpp:42
@@ -6556,8 +6680,8 @@ msgstr "Fonter"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr ""
 
@@ -6853,15 +6977,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7263,173 +7385,138 @@ msgid "Up"
 msgstr "Upp"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Skill points tillgängliga: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr "Skill Set %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "Skill %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Lvl: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr "P"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "Bjud in"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Accepterad party-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Nekad party-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Accepterad guild-inbjudning från %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Nekad guild-inbjudning från %s."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Skapar guilden %s."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "Skapar partyt %s."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "Guild-namn"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "Välj ditt guild-namn."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr "Tog emot guild-request, då ett redan existerar."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s har bjudit in dig att joina guilden %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "Acceptera Guild-inbjudningar"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "Tog emot party-request, även om ett redan existerar."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "Du har blivit inbjuden att joina ett party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Du har blivit inbjuden att joina %s party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s har bjudit in dig att joina deras party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s har bjudit in dig att joina %s party."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "Acceptera Party-invite"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "Kan inte skapa party. Du är redan i ett party"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "Party-namn"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "Välj ditt party-namn."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7569,9 +7656,10 @@ msgstr "Du har inte tillräckligt med pengar."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i fönstret."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Misslyckades att lägga till item. Du kan inte överlappa ens sorts item i "
+"fönstret."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -7656,25 +7744,25 @@ msgstr "Välj värld"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "key_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr "JButton%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr "okänd eller borttappad tangent"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr "JB%d"
@@ -7682,7 +7770,7 @@ msgstr "JB%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "u-tangenten"
 
@@ -8840,7 +8928,9 @@ msgstr ""
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:75
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är taget."
+msgstr ""
+"Misslyckades att skapa karaktär. Troligen på grund av att namnet redan är "
+"taget."
 
 #. TRANSLATORS: error message
 #: src/net/ea/charserverrecv.cpp:80 src/net/ea/loginrecv.cpp:160
@@ -8983,7 +9073,8 @@ msgstr "Nekad från servern."
 #: src/net/ea/loginrecv.cpp:136 src/net/eathena/loginrecv.cpp:74
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
-msgstr "Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
+msgstr ""
+"Du har blivit permanent bannad från spelet. Vänligen kontakta GM-teamet."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:141 src/net/eathena/loginrecv.cpp:79
@@ -8998,7 +9089,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Du har blivit temporärt bannad från spelet tills %s.⏎ Vänligen kontakta GM-teamet via forumet."
+msgstr ""
+"Du har blivit temporärt bannad från spelet tills %s.⏎ Vänligen kontakta GM-"
+"teamet via forumet."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10568,30 +10661,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr ""
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -10602,11 +10695,6 @@ msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr ""
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr ""
@@ -10625,7 +10713,9 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Valmöjligheter till /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Valmöjligheter till /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", "
+"\"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10681,3 +10771,30 @@ msgstr "%d sekund"
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekunder"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Guild-namn saknas."
+
+#~ msgid "Invite"
+#~ msgstr "Bjud in"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "Skapar guilden %s."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "Skapar partyt %s."
+
+#~ msgid "Guild Name"
+#~ msgstr "Guild-namn"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "Välj ditt guild-namn."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "Kan inte skapa party. Du är redan i ett party"
+
+#~ msgid "Party Name"
+#~ msgstr "Party-namn"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "Välj ditt party-namn."
diff --git a/po/tr.po b/po/tr.po
index f2b219307..5c8add19e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Oben Devin Çetiner <hiironohige@gmail.com>, 2012
@@ -10,14 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/tr/)\n"
+"Language-Team: Turkish (http://www.transifex.com/akaras/manaplus/language/"
+"tr/)\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. TRANSLATORS: file uploaded message
@@ -31,7 +32,6 @@ msgstr "Dosya yüklendi"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -51,10 +51,9 @@ msgstr "Dosya yüklendi"
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -103,80 +102,85 @@ msgid "Uploaded log into:"
 msgstr "Log kayıtları şuraya yüklendi:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
 msgstr "\"%s\" fısıltı penceresi açılamadı! Muhtemelen zaten açık."
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Parti adı eksik."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Parti kur"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Guild adı eksik."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Oluştur"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Lütfen bir isim belirtin."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "Enter tuşu sohbeti açar/kapatır."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "Mesaj sohbeti kapatır."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "Enter tuşu sohbeti şimdi sonlandırır."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "Mesaj sohbeti şimdi kapatır."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -450,8 +454,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "Tamamen görmezden gel"
 
@@ -535,8 +539,8 @@ msgstr "Yardım"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -1238,21 +1242,24 @@ msgstr "Mesaj"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr "Dirilt"
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Ağırlığının yarısından daha ağır eşya taşıyorsun. Kendiliğinden iyileşemiyorsun."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Ağırlığının yarısından daha ağır eşya taşıyorsun. Kendiliğinden "
+"iyileşemiyorsun."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
 msgid "You are carrying less than half your weight. You can regain health."
-msgstr "Ağırlığının yarısından daha hafif eşya taşıyorsun. Kendiliğinden iyileşebiliyorsun."
+msgstr ""
+"Ağırlığının yarısından daha hafif eşya taşıyorsun. Kendiliğinden "
+"iyileşebiliyorsun."
 
 #. TRANSLATORS: chat color
 #. TRANSLATORS: inventory sort mode
@@ -1263,8 +1270,7 @@ msgstr "Ağırlığının yarısından daha hafif eşya taşıyorsun. Kendiliği
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "varsayılan"
 
@@ -1425,8 +1431,8 @@ msgstr "Kocaman (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(varsayılan)"
 
@@ -1732,8 +1738,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1752,58 +1758,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "Parti kur"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "İptal"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1825,7 +1779,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1839,8 +1793,8 @@ msgstr "Takas"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "Saldırı"
@@ -1851,36 +1805,36 @@ msgstr "Saldırı"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "Fısıltı"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "İyileş"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "Guild'den at"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 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:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "Guild'e davet et"
 
@@ -1888,7 +1842,7 @@ msgstr "Guild'e davet et"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "Nuke"
 
@@ -1905,9 +1859,9 @@ msgstr "Nuke"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "Taşı"
@@ -1916,7 +1870,7 @@ msgstr "Taşı"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Konuş"
@@ -1931,7 +1885,7 @@ msgstr "Konuş"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1949,7 +1903,7 @@ msgstr "Satın Al"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1961,26 +1915,26 @@ msgstr "Sat"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr "Yorum ekle"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 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:320
+#: src/gui/popups/popupmenu.cpp:321
 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:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "Saldırı listesine ekle"
 
@@ -1988,19 +1942,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:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 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:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr "Sahibe git"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr "Kov"
 
@@ -2008,7 +1962,7 @@ msgstr "Kov"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr "Besle"
 
@@ -2018,8 +1972,8 @@ msgstr "Besle"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "Yeniden adlandır"
@@ -2028,13 +1982,13 @@ msgstr "Yeniden adlandır"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr "Öldür"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr "Ganimet bırak"
 
@@ -2042,7 +1996,7 @@ msgstr "Ganimet bırak"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2055,7 +2009,7 @@ msgstr "Çıkar"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr "Yumurtaya dön"
 
@@ -2063,39 +2017,88 @@ 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:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "Sohbete isim ekle"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "İptal"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Oyuncular"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Partiden at"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "Topla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Sohbete ekle"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "Harita itemi"
 
@@ -2105,28 +2108,28 @@ msgstr "Harita itemi"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "Kaldır"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr "Dönüştür"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr "Hareket kamerası"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr ""
 
@@ -2135,7 +2138,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2143,69 +2146,68 @@ msgstr "Kıyafetler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr "Kıyafetlerin hepsini çıkart"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Büyüler"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 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:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "Temizle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "Vurgulamayı kapat"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr "Vurgulamayı aç"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 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:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "AFK aç"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "Ayrıl"
 
@@ -2215,116 +2217,116 @@ msgstr "Ayrıl"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr "Panoya kopyala"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "Guild pozisyonunu değiştir"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr "pencere"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr "Kilidi aç"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr "Kilitle"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 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:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "İsim:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr "Oyuncu yorumu             "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr "Yorum:                        "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 msgid "Add to trade"
 msgstr "Takasa ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1745
+#: src/gui/popups/popupmenu.cpp:1762
 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:1750
+#: src/gui/popups/popupmenu.cpp:1767
 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:1754
+#: src/gui/popups/popupmenu.cpp:1771
 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:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr "Tamamını takasa ekle"
 
@@ -2333,8 +2335,8 @@ msgstr "Tamamını takasa ekle"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2342,63 +2344,63 @@ msgstr "Sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "Sakla 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 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:1783
+#: src/gui/popups/popupmenu.cpp:1800
 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:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Tamamını sakla"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "Geri al"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "Geri al 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 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:1826
+#: src/gui/popups/popupmenu.cpp:1843
 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:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Tamamını geri al"
 
@@ -2409,17 +2411,17 @@ msgstr "Tamamını geri al"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Kullan"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr ""
 
@@ -2428,43 +2430,43 @@ msgstr ""
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr ""
 
@@ -2472,175 +2474,245 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "Varsayılan"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Otomatik konum sabitleme"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 msgid "Disregard"
 msgstr "İhmal et"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 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:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "Görmezden gelmeyi bırak"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "Satın Al (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "Gruba davet et"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "Nesneleri göster"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr "Toplama listesinden kaldır"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Add to pickup list"
 msgstr "Toplama listesine ekle"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Bırak..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr ""
 
@@ -2648,38 +2720,38 @@ msgstr ""
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Bırak"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr ""
 
@@ -2688,7 +2760,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2697,7 +2769,7 @@ msgstr "Envanter"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr ""
 
@@ -2706,7 +2778,7 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2715,31 +2787,31 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr ""
 
@@ -2747,7 +2819,7 @@ msgstr ""
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr ""
 
@@ -2755,109 +2827,109 @@ msgstr ""
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2865,31 +2937,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2898,19 +2970,19 @@ msgstr ""
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2922,8 +2994,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2931,63 +3003,82 @@ msgstr "Bilgi"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "Gruptan ayrıl?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr ""
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Otomatik konum sabitleme"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "Parti: %s"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3522,6 +3613,11 @@ msgstr ""
 msgid "Party"
 msgstr "Grup"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Parti adı eksik."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3530,15 +3626,13 @@ msgstr "Nesne paylaşımı etkinleştirildi."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Nesne paylaşımı devre dışı bırakıldı."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Nesne paylaşımı mümkün değil."
 
@@ -3549,22 +3643,19 @@ msgstr "Nesne paylaşımı bilinmiyor."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4005,15 +4096,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Renkler"
 
@@ -4037,15 +4128,18 @@ msgstr "Sohbet renkleri listesini göster"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_chat.cpp:90
 msgid "Allow magic and GM commands in all chat tabs"
-msgstr "Bütün sohbet pencerelerinde büyü ve GM komutlarının kullanılmasına izin ver"
+msgstr ""
+"Bütün sohbet pencerelerinde büyü ve GM komutlarının kullanılmasına izin ver"
 
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:92
@@ -4066,9 +4160,11 @@ msgstr "Sohbet satırında bulunacak en yüksek harf sayısını sınırla"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4079,7 +4175,9 @@ msgstr "Sohbette görünülecek en yüksek satır sayısını sınırla"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4120,8 +4218,8 @@ msgstr "Sohbet geçmişini göster"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4132,9 +4230,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4145,9 +4245,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4163,9 +4265,13 @@ msgstr "Alışveriş mesajlarını gizle"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4178,7 +4284,8 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4197,9 +4304,12 @@ msgstr "Bütün fısıltıları sekmelere koy"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4210,7 +4320,8 @@ msgstr "Büyü mesajlarını hata ayıklama sekmesinde kayıt altına al"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4223,9 +4334,11 @@ msgstr "Sunucu mesajlarını hata ayıklama sekmesinde göster"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4250,9 +4363,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4263,7 +4378,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4276,7 +4392,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4289,7 +4407,9 @@ msgstr "Savaş sekmesini etkinleştir"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4315,7 +4435,10 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4350,7 +4473,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4363,7 +4487,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4376,9 +4501,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4467,11 +4595,6 @@ msgid "Unassign"
 msgstr "Sil"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "Varsayılan"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr ""
@@ -4492,7 +4615,9 @@ msgstr "Tuş çatışması tespit edildi."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "\"%s\" ve \"%s\" tuşları çakıştı. Çakışmayı giderin, yoksa oynanabilirlikte gariplikler meydana gelebilir."
+msgstr ""
+"\"%s\" ve \"%s\" tuşları çakıştı. Çakışmayı giderin, yoksa oynanabilirlikte "
+"gariplikler meydana gelebilir."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5756,70 +5881,70 @@ msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr "Öncelikli canavarlar"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr "Saldırılacak canavarlar"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr "Canavarları görmezden gel"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "%s kullanıcısı %s loncasına davet edildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "%s loncasından çıkış istendi."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "Loncaya üye davet et"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "%s loncasına kimi davet etmek istersin?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "Loncadan ayrıl?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "%s loncasından ayrılmak istediğine emin misin?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
@@ -5831,41 +5956,41 @@ msgid "Nav"
 msgstr "Navigasyon"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "%s adlı oyuncu gruba davet edildi."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Grup %s 'ten çıkış istendi."
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "Üye Gruba Daveti"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Grup %s 'e kimi davet etmek istersin?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "Gruptan ayrıl?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "%s grubundan ayrılmak istediğinize emin misin?"
@@ -5877,17 +6002,17 @@ msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr "Nesneleri Topla"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr "Nesneleri görmezden gel"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
@@ -6120,10 +6245,8 @@ msgstr ""
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Oluştur"
 
@@ -6240,8 +6363,7 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6259,8 +6381,7 @@ msgstr "Lütfen %d puanı dağıt"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6286,8 +6407,7 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr ""
 
@@ -6452,11 +6572,6 @@ msgid "Yes"
 msgstr "Evet"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr ""
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr ""
@@ -6488,8 +6603,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "Bağlan"
 
@@ -6558,8 +6672,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr ""
 
@@ -6855,15 +6969,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7265,173 +7377,138 @@ msgid "Up"
 msgstr "Yukarı"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Mevcut yetenek puanları: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr "Yetenek Seti %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "Yetenek %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Level: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "Davet et"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "%s 'ten gelen grup daveti kabul edildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "%s 'ten gelen grup daveti reddedildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "%s ten gelen lonca davetiyesi kabul edildi."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "%s ten gelen lonca davetiyesi reddedildi."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "%s isimli lonca oluşturuluyor."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "%s adlı grup kuruluyor."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "Lonca Adı"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "Loncanızın adını seçiniz."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr "Lonca isteği alındı, ancak halihazırda bir tane var."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s seni %s loncasına katılmaya davet etti."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "Lonca davetini kabul et"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "Bir grup daveti aldın, ancak zaten bir gruba dahilsin."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "Bir gruba katılma daveti aldın."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "%s grubuna katılmaya davet edildin."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s seni gruplarına davet etti."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s seni %s grubuna davet etti."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "Grup Davetini Kabul et"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "Grup kuramazsın. Zaten bir gruba dahilsin"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "Grup Adı"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "Grubunun adını seç."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7571,9 +7648,10 @@ msgstr "Yeterli paran yok."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
-msgstr "Nesne eklemesi başarısız oldu. Pencerede aynı tür nesneyi üst üste koyamazsınız."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Nesne eklemesi başarısız oldu. Pencerede aynı tür nesneyi üst üste "
+"koyamazsınız."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:539
@@ -7658,25 +7736,25 @@ msgstr "Dünya Seç"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7684,7 +7762,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -10570,30 +10648,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr ""
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -10604,11 +10682,6 @@ msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr ""
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr ""
@@ -10627,7 +10700,8 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "/%s ayar seçenekleri \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\" 'dir."
+msgstr ""
+"/%s ayar seçenekleri \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\" 'dir."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10683,3 +10757,30 @@ msgstr "%d saniye"
 #, c-format
 msgid "%d seconds"
 msgstr "%d saniyeler"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Guild adı eksik."
+
+#~ msgid "Invite"
+#~ msgstr "Davet et"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "%s isimli lonca oluşturuluyor."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "%s adlı grup kuruluyor."
+
+#~ msgid "Guild Name"
+#~ msgstr "Lonca Adı"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "Loncanızın adını seçiniz."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "Grup kuramazsın. Zaten bir gruba dahilsin"
+
+#~ msgid "Party Name"
+#~ msgstr "Grup Adı"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "Grubunun adını seç."
diff --git a/po/uk.po b/po/uk.po
index 04248cea8..0a0c1c86f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # tivasyk <tivasyk@gmail.com>, 2010
 # William Lee <v4r@trioptimum.com>, 2014
@@ -10,15 +10,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/uk/)\n"
+"Language-Team: Ukrainian (http://www.transifex.com/akaras/manaplus/language/"
+"uk/)\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. TRANSLATORS: file uploaded message
 #: src/actions/actions.cpp:164
@@ -31,7 +33,6 @@ msgstr "Файл завантажено"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -51,10 +52,9 @@ msgstr "Файл завантажено"
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -103,80 +103,87 @@ msgid "Uploaded log into:"
 msgstr "Завантажений лог:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
-msgstr "Неможливо створити вкладку для спілкування з гравцем \"%s\" - або така вже існує, або ви намагаєтесь перешіптуватись сам із собою :P ."
+msgstr ""
+"Неможливо створити вкладку для спілкування з гравцем \"%s\" - або така вже "
+"існує, або ви намагаєтесь перешіптуватись сам із собою :P ."
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "Не вистачає назви групи."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "Створити групу"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "Не вистачає назви гільдії."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "Гільдія цілі:"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "Будь ласка, вкажіть гравця."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "Enter перемикає на чат."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "Повідомлення закриває вікно чату."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "Enter тепер перемикає на вікно чату."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "Тепер повідомлення закриватиме вікно чату."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -451,8 +458,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "Остаточно ігнорувати"
 
@@ -536,8 +543,8 @@ msgstr "Довідка"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -674,7 +681,8 @@ msgstr "  -h --help           : Показати ще раз цю довідку
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:65
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file    : Файл, з якого необхідно завантажити налаштування"
+msgstr ""
+"  -C --config-file    : Файл, з якого необхідно завантажити налаштування"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:68
@@ -709,7 +717,8 @@ msgstr "  -p --port           : Порт логіну"
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:86
 msgid "  -H --update-host    : Use this update host"
-msgstr "  -H --update-host    : Сервер, з якого необхідно завантажити оновлення"
+msgstr ""
+"  -H --update-host    : Сервер, з якого необхідно завантажити оновлення"
 
 #. TRANSLATORS: command line help
 #: src/commandline.cpp:89
@@ -1239,16 +1248,17 @@ msgstr "Повідомлення"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr "Опритомнити"
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
-msgstr "Ви навантажені більше, ніж на половину максимально дозволенного. Тепер ви не зможете відновлюватися."
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Ви навантажені більше, ніж на половину максимально дозволенного. Тепер ви не "
+"зможете відновлюватися."
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:198
@@ -1264,8 +1274,7 @@ msgstr "Ви навантажені менш, ніж на половину. Те
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "за замовчуванням"
 
@@ -1426,8 +1435,8 @@ msgstr "Величезний (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(за замовчуванням)"
 
@@ -1733,8 +1742,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1753,58 +1762,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "Створити групу"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "Скасувати"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1826,7 +1783,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1840,8 +1797,8 @@ msgstr "Торгівля"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "Атака"
@@ -1852,36 +1809,36 @@ msgstr "Атака"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "Шепіт"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "Вилікувати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "Виштовхати з гільдії"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 msgid "Change pos in guild"
 msgstr "Змінити позицію в гільдії"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "Запросити до гільдії"
 
@@ -1889,7 +1846,7 @@ msgstr "Запросити до гільдії"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "Знищити"
 
@@ -1906,9 +1863,9 @@ msgstr "Знищити"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "Рух"
@@ -1917,7 +1874,7 @@ msgstr "Рух"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "Діалог"
@@ -1932,7 +1889,7 @@ msgstr "Діалог"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1950,7 +1907,7 @@ msgstr "Придбати"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1962,26 +1919,26 @@ msgstr "Продати"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr "Додати примітку"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 msgid "Remove from attack list"
 msgstr "Видалити зі списку атаки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:320
+#: src/gui/popups/popupmenu.cpp:321
 msgid "Add to priority attack list"
 msgstr "Додати до пріоритетного списку атаки"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "Додати до списку атаки"
 
@@ -1989,19 +1946,19 @@ msgstr "Додати до списку атаки"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 msgid "Add to ignore list"
 msgstr "Ігнорувати тип мобу"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr "Наблизити до власника"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr "Атакувати"
 
@@ -2009,7 +1966,7 @@ msgstr "Атакувати"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr "Нагодувати"
 
@@ -2019,8 +1976,8 @@ msgstr "Нагодувати"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "Перейменувати"
@@ -2029,13 +1986,13 @@ msgstr "Перейменувати"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr "Вбити"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr "Скинути дропи"
 
@@ -2043,7 +2000,7 @@ msgstr "Скинути дропи"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2056,7 +2013,7 @@ msgstr "Зняти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr "Повернути до яйця"
 
@@ -2064,39 +2021,88 @@ msgstr "Повернути до яйця"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "Додати ім'я до чату"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "Скасувати"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "Гравці"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "Виштовхати з групи"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "Підняти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "Додати до чату"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "Елемент карти"
 
@@ -2106,28 +2112,28 @@ msgstr "Елемент карти"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "Видалити"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr "Телепорт"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr "Рухати камеру"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr ""
 
@@ -2136,7 +2142,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2144,69 +2150,68 @@ msgstr "Швидке спорядження"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr "Видалити швидке спорядження"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "Заклинання"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 msgid "Edit spell"
 msgstr "Редагувати заклинання"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "Скинути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "Вимкнути підсвічування"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr "Увімкнути підсвічування"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 msgid "Don't remove name"
 msgstr "Не приховувати ім'я"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "Приховати ім'я"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "Дозволити режим \"Відсутній\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 msgid "Disable away"
 msgstr "Заборонити режим \"Відсутній\""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "Залишити"
 
@@ -2216,116 +2221,116 @@ msgstr "Залишити"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr "Внести в буфер обміну"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "Змінити позицію в гільдії"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr "вікно"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr "Відімкнути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr "Зафіксувати"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr "Гравець"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr "Гомункул"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr "Крамарі"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 msgid "Rename map sign          "
 msgstr "Перейменувати            "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "Ім'я:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr "Примітка до гравця        "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr "Примітка:                     "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 msgid "Add to trade"
 msgstr "Додати до торгівлі"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1745
+#: src/gui/popups/popupmenu.cpp:1762
 msgid "Add to trade 10"
 msgstr "Додати до торгівлі 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1767
 msgid "Add to trade half"
 msgstr "Додати половину до торгівлі"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1771
 msgid "Add to trade all-1"
 msgstr "Додати все окрім одного"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr "Додати всю кількість"
 
@@ -2334,8 +2339,8 @@ msgstr "Додати всю кількість"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2343,63 +2348,63 @@ msgstr "Зберегти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "Зберегти 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "Зберегти половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr "Зберегти все окрім одного"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "Зберегти всю кількість"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "Вилучити"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "Вилучити 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 msgid "Retrieve half"
 msgstr "Вилучити половину"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr "Вилучити все окрім одного"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "Вилучити всю кількість"
 
@@ -2410,17 +2415,17 @@ msgstr "Вилучити всю кількість"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "Використати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr "Скинути значення комірців"
 
@@ -2429,43 +2434,43 @@ msgstr "Скинути значення комірців"
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "Сховати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "Показати"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 msgid "Reset yellow bar"
 msgstr "Скинути Жовтий рядок"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr "Додати до чату"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "Пріоритет вище"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr "Пріоритет нижче"
 
@@ -2473,175 +2478,245 @@ msgstr "Пріоритет нижче"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr "Роздягнути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr "Копіювати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr "Вставити"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr "Відвідати посилання"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr "Показати вікно"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "За замовчуванням"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr "Ціль"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "Корегування позиції"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr "Сам"
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 msgid "Disregard"
 msgstr "Зневажати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "Ігнорувати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr "В чорний список"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr "Позначити супротивником"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr "Стерти"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "Приятелювати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "Повернути з ігнору"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "Іти слідом"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "Купувати (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "Продати (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "Запросити до групи"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr "Ввійти до чату %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "Показати спорядження"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr "Видалити зі списку підбирання"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Add to pickup list"
 msgstr "Додати до списку підбирання"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr "Зняти захист"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr "Захистити предмет"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "Кинути..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "Кинути все"
 
@@ -2649,38 +2724,38 @@ msgstr "Кинути все"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "Кинути"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr "ГМ..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr ""
 
@@ -2689,7 +2764,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2698,7 +2773,7 @@ msgstr "Сумка"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr "Сховище"
 
@@ -2707,7 +2782,7 @@ msgstr "Сховище"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2716,31 +2791,31 @@ msgstr "Візок"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "Команди"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr "Перевірити IP"
 
@@ -2748,7 +2823,7 @@ msgstr "Перевірити IP"
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr "Відвідати"
 
@@ -2756,109 +2831,109 @@ msgstr "Відвідати"
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr "Викликати"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2866,31 +2941,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr "Виштовхати"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2899,19 +2974,19 @@ msgstr ""
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2923,8 +2998,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2932,63 +3007,82 @@ msgstr "Відомості"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr "ГМ команди"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "Вийти з групи?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr ""
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "Корегування позиції"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "Тип: %s"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3523,6 +3617,11 @@ msgstr "Мова"
 msgid "Party"
 msgstr "Група"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "Не вистачає назви групи."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3531,15 +3630,13 @@ msgstr "Розподіл предметів увімкнено."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "Розподіл предметів вимкнено."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "Неможливо ввімкнути розподіл предметів."
 
@@ -3550,22 +3647,19 @@ msgstr "Невідомий стан розподілу предметів."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "Розподіл досвіду ввімкнено."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "Розподіл досвіду вимкнено."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "Неможливо ввімкнути розподіл досвіду."
 
@@ -4006,15 +4100,15 @@ msgstr "Захищати фокус чату"
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "Кольори"
 
@@ -4038,9 +4132,11 @@ msgstr "Показувати список кольорів чату"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4067,9 +4163,11 @@ msgstr "Обмежити кількість символів у повідомл
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4080,7 +4178,9 @@ msgstr "Обмежити кількість рядків вікна чату"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4121,8 +4221,8 @@ msgstr "Показувати історію чату"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4133,9 +4233,11 @@ msgstr "Сповіщати про появлення членів групи"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4146,9 +4248,11 @@ msgstr "Сповіщати про появлення членів гільдії
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4164,9 +4268,13 @@ msgstr "Не показувати робочі повідомлення крам
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4179,7 +4287,8 @@ msgstr "Показувати MVP повідомлення"
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4198,9 +4307,12 @@ msgstr "Шепіт (приватне спілкування) в окремих �
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4211,7 +4323,8 @@ msgstr "Лог магії у вкладці зневадження"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4224,9 +4337,11 @@ msgstr "Показувати сповіщення сервера у вкладц
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4251,9 +4366,11 @@ msgstr "Ввімкнути ГМ вкладку"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4264,7 +4381,8 @@ msgstr "Ввімкнути вкладку для мови"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4277,7 +4395,9 @@ msgstr "Показувати повідомлення на всіх мовах"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4290,7 +4410,9 @@ msgstr "Ввімкнути вкладку бійки"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4316,7 +4438,10 @@ msgstr "Змінювати розмір вкладок чату за потре�
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4351,7 +4476,8 @@ msgstr "Підсвічувані слова (відокремлені комам
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4364,7 +4490,8 @@ msgstr "Ігнорування глобальні повідомлення ві�
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4377,9 +4504,12 @@ msgstr "Показати кнопку смайликів у чаті"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4468,11 +4598,6 @@ msgid "Unassign"
 msgstr "Відмінити"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "За замовчуванням"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr "Скинути всі клавіші"
@@ -4493,7 +4618,9 @@ msgstr "Деякі клавіші дублюють одна одну."
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr "Клавіші \"%s\" та \"%s\" конфліктують. Необхідно усунути повтори,інакше керування може бути ускладненим."
+msgstr ""
+"Клавіші \"%s\" та \"%s\" конфліктують. Необхідно усунути повтори,інакше "
+"керування може бути ускладненим."
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
@@ -5101,7 +5228,9 @@ msgstr "Вимкнути кешування істот"
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:129
 msgid "Different options (enable or disable can improve performance)"
-msgstr "Різні налаштунки (ввімкнення чи вимкнення може призвести до кращої продуктивності)"
+msgstr ""
+"Різні налаштунки (ввімкнення чи вимкнення може призвести до кращої "
+"продуктивності)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:134
@@ -5136,7 +5265,8 @@ msgstr "Занести в кеш всі звуки (може забрати до
 #. TRANSLATORS: settings group
 #: src/gui/widgets/tabs/setup_perfomance.cpp:160
 msgid "Critical options (DO NOT change if you don't know what you're doing)"
-msgstr "Критичні налаштунки (НІ В ЯКОМУ РАЗУ не чіпайте, якщо не впевнені, що робите)"
+msgstr ""
+"Критичні налаштунки (НІ В ЯКОМУ РАЗУ не чіпайте, якщо не впевнені, що робите)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_perfomance.cpp:164
@@ -5262,7 +5392,9 @@ msgstr ""
 #: src/gui/widgets/tabs/setup_players.cpp:143
 msgid ""
 "Emulate right mouse button by long mouse click (useful for touch interfaces)"
-msgstr "Емуляція правого кліку миші подовженим лівим кліком (вживане на тач інтерфейсах)"
+msgstr ""
+"Емуляція правого кліку миші подовженим лівим кліком (вживане на тач "
+"інтерфейсах)"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_players.cpp:148
@@ -5757,70 +5889,70 @@ msgid "Atk"
 msgstr "Атк"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr "Пріоритет мобів"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr "Звичайні"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr "Ігноровані"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr "Друзів: %u/%u"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr "Гравців: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Запрошено гравця %s до гільдії %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Запит на вихід з гільдії %s подано."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "Запрошення в гільдію"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Кого ви бажаєте запросити до гільдії %s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "Залишити гільдію?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Ви дійсно хочете вийти з гільдії %s?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr "Членів: %u/%u"
@@ -5832,41 +5964,41 @@ msgid "Nav"
 msgstr "Нав"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr "Телепортів: %u/%u"
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Запрошено гравця %s до групи."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Запит на вихід з групи %s подано."
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr "Запросити гравця до групи"
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Кого ви бажаєте запросити до групи %s?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "Вийти з групи?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Ви дійсно хочете вийти з групи %s?"
@@ -5878,17 +6010,17 @@ msgid "Pik"
 msgstr "Підн"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr "Піднімати предмети"
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr "Ігнорувати предмети"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr "Видимих гравців: %d"
@@ -6121,10 +6253,8 @@ msgstr "Кількість:"
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "Створити"
 
@@ -6241,8 +6371,7 @@ msgstr "^"
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6260,8 +6389,7 @@ msgstr "Будь ласка, розподіліть %d балів"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6287,8 +6415,7 @@ msgstr "Вигляд:"
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr "П"
 
@@ -6387,7 +6514,12 @@ msgid ""
 "Level: %u\n"
 "Experience: %u\n"
 "Money: %s"
-msgstr "Hp: %u/%u\nMp: %u/%u\nРівень: %u\nДосвід: %u\nКошти: %s"
+msgstr ""
+"Hp: %u/%u\n"
+"Mp: %u/%u\n"
+"Рівень: %u\n"
+"Досвід: %u\n"
+"Кошти: %s"
 
 #. TRANSLATORS: error message
 #: src/gui/windows/charselectdialog.cpp:299
@@ -6453,11 +6585,6 @@ msgid "Yes"
 msgstr "Так"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr "Ціль"
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr "Мережа"
@@ -6489,8 +6616,7 @@ msgstr "Редагувати сервер"
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "З'єднання"
 
@@ -6559,8 +6685,8 @@ msgstr "Шрифти"
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr "Невідомий"
 
@@ -6858,15 +6984,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7268,173 +7392,138 @@ msgid "Up"
 msgstr "Вище"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Балів вмінь: %d"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr "Група вмінь %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "Вміння %d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "Рівень: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr "Невдале вміння: %s"
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr "Г"
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "Запросити"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Прийнято запрошення в групу від %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Відхилено запрошення в групу від %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "Прийнято запрошення в гільдію від %s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "Відхилено запрошення в гільдію від %s."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Створено гільдію %s."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "Створено група %s."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "Назва гільдії"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "Оберіть назву гільдії."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr "Отримано запрошення до гільдії, але одне вже є."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s запрошує вас до гільдії %s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "Прийняти запрошення до гільдії"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "Отримано запрошення до групи, але одне вже є."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "Вас запросили до групи."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Вас запросили до групи %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s запрошує вас приєднатись до їх групи."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s запрошує вас до групи %s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "Запрошення до групи прийнято"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "Неможливо створити групу, бо ви все є членом однієї"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr "Група"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "Оберіть назву групи."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7574,8 +7663,7 @@ msgstr "У тебе недостатньо коштів."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "Не вдається додати предмет. Не можна накладати предмети одного типу."
 
 #. TRANSLATORS: trade error
@@ -7661,25 +7749,25 @@ msgstr "Оберіть світ"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr "клавіша_%d"
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr "КлавішаДж%d"
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr "невідома клавіша"
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr "ДЖ%d"
@@ -7687,7 +7775,7 @@ msgstr "ДЖ%d"
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr "невід."
 
@@ -9003,7 +9091,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "Вас було тимчасово забанено до %s.\nЗвертайтесь до команди ГМ'ів на форумі."
+msgstr ""
+"Вас було тимчасово забанено до %s.\n"
+"Звертайтесь до команди ГМ'ів на форумі."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10573,30 +10663,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr "Невідомо:"
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr " / Мана: -%d"
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr "Дальність: %d"
@@ -10607,11 +10697,6 @@ msgid "Ground"
 msgstr "Земля"
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr "Сам"
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr "Не використаний"
@@ -10630,7 +10715,9 @@ msgstr ""
 #: src/utils/booleanoptions.h:29
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr "Можливими опціями для /%s є: \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Можливими опціями для /%s є: \"yes\", \"no\", \"true\", \"false\", \"1\", "
+"\"0\"."
 
 #. TRANSLATORS: uptime command
 #: src/utils/stringutils.cpp:946
@@ -10686,3 +10773,30 @@ msgstr "%d секунда"
 #, c-format
 msgid "%d seconds"
 msgstr "%d секунд"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "Не вистачає назви гільдії."
+
+#~ msgid "Invite"
+#~ msgstr "Запросити"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "Створено гільдію %s."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "Створено група %s."
+
+#~ msgid "Guild Name"
+#~ msgstr "Назва гільдії"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "Оберіть назву гільдії."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "Неможливо створити групу, бо ви все є членом однієї"
+
+#~ msgid "Party Name"
+#~ msgstr "Група"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "Оберіть назву групи."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 92f8ad065..b410b6835 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # colorful <colorfullife81@gmail.com>, 2011
@@ -15,14 +15,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/akaras/manaplus/"
+"language/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
@@ -36,7 +37,6 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -56,10 +56,9 @@ msgstr ""
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -108,80 +107,85 @@ msgid "Uploaded log into:"
 msgstr ""
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
 msgstr ""
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "帮会名称缺失."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "建立"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "公会名称缺失."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "建立"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "请指定一个名称."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "<回车>键促发聊天."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "讯息关闭聊天."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "<回车>键现在促发聊天."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "讯息现在关闭聊天."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr ""
@@ -454,8 +458,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -539,8 +543,8 @@ msgstr "帮助"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -1242,15 +1246,14 @@ msgstr "讯息"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "你已携带超过半数负重。无法回复健康（体力）."
 
 #. TRANSLATORS: weight message
@@ -1267,8 +1270,7 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "默认"
 
@@ -1429,8 +1431,8 @@ msgstr ""
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1736,8 +1738,8 @@ msgstr ""
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1756,58 +1758,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "建立"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "取消"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1829,7 +1779,7 @@ msgstr ""
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1843,8 +1793,8 @@ msgstr "交易"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "攻击"
@@ -1855,36 +1805,36 @@ msgstr "攻击"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "密语"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "愈合"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "踢从公会"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 msgid "Change pos in guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr ""
 
@@ -1892,7 +1842,7 @@ msgstr ""
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr ""
 
@@ -1909,9 +1859,9 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "移动"
@@ -1920,7 +1870,7 @@ msgstr "移动"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "说话"
@@ -1935,7 +1885,7 @@ msgstr "说话"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1953,7 +1903,7 @@ msgstr "购买"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1965,26 +1915,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr "发表评论"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 msgid "Remove from attack list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:320
+#: src/gui/popups/popupmenu.cpp:321
 msgid "Add to priority attack list"
 msgstr "优先攻击列表"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "加入攻击清单"
 
@@ -1992,19 +1942,19 @@ msgstr "加入攻击清单"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 msgid "Add to ignore list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr ""
 
@@ -2012,7 +1962,7 @@ msgstr ""
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr ""
 
@@ -2022,8 +1972,8 @@ msgstr ""
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "重命名"
@@ -2032,13 +1982,13 @@ msgstr "重命名"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr ""
 
@@ -2046,7 +1996,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2059,7 +2009,7 @@ msgstr "卸下装备"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr ""
 
@@ -2067,39 +2017,88 @@ msgstr ""
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "取消"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "踢从党"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "拾取"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "加入聊天"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "地图项"
 
@@ -2109,28 +2108,28 @@ msgstr "地图项"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr ""
 
@@ -2139,7 +2138,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2147,69 +2146,68 @@ msgstr "套装"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "法术"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 msgid "Edit spell"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "清除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "禁用"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr "启用突出"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 msgid "Don't remove name"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "移除姓名"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "启用远"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 msgid "Disable away"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "留下"
 
@@ -2219,116 +2217,116 @@ msgstr "留下"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "更改公会的立场"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr ""
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 msgid "Rename map sign          "
 msgstr "重命名的地图标志          "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "名称:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr "玩家评论                  "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr "评论:                        "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 msgid "Add to trade"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1745
+#: src/gui/popups/popupmenu.cpp:1762
 msgid "Add to trade 10"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1767
 msgid "Add to trade half"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1771
 msgid "Add to trade all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr ""
 
@@ -2337,8 +2335,8 @@ msgstr ""
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2346,63 +2344,63 @@ msgstr "存储"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "商店10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "商店的一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "商店所有"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "取回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "拿出10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 msgid "Retrieve half"
 msgstr "拿出一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "检索所有"
 
@@ -2413,17 +2411,17 @@ msgstr "检索所有"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr ""
 
@@ -2432,43 +2430,43 @@ msgstr ""
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "隐藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "显示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 msgid "Reset yellow bar"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "x"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr ""
 
@@ -2476,175 +2474,245 @@ msgstr ""
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "预设"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+#, fuzzy
+msgid "Mouse position"
+msgstr "自动修复的位置"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 msgid "Disregard"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "是朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "按照"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "购买(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "出售(?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "显示项目"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Add to pickup list"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "掉落..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "所有"
 
@@ -2652,38 +2720,38 @@ msgstr "所有"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "丢弃"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr ""
 
@@ -2692,7 +2760,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2701,7 +2769,7 @@ msgstr "物品栏"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr "仓库"
 
@@ -2710,7 +2778,7 @@ msgstr "仓库"
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2719,31 +2787,31 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr "命令"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr ""
 
@@ -2751,7 +2819,7 @@ msgstr ""
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr ""
 
@@ -2759,109 +2827,109 @@ msgstr ""
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2869,31 +2937,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr ""
@@ -2902,19 +2970,19 @@ msgstr ""
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2926,8 +2994,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2935,63 +3003,82 @@ msgstr "信息"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "离开团队?"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr ""
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "自动修复的位置"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "团队:%s"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3526,6 +3613,11 @@ msgstr ""
 msgid "Party"
 msgstr "t"
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "帮会名称缺失."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3534,15 +3626,13 @@ msgstr "物品共享开启."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr "物品共享关闭."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr "物品共享不可能."
 
@@ -3553,22 +3643,19 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr "经验共享开启."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr "经验共享关闭."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr "经验共享不可能."
 
@@ -4009,15 +4096,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr "颜色"
 
@@ -4041,9 +4128,11 @@ msgstr "显示聊天颜色列表"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4070,9 +4159,11 @@ msgstr "文字数量超过限制"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4083,7 +4174,9 @@ msgstr "限制聊天的最大"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4124,8 +4217,8 @@ msgstr "显示聊天记录"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4136,9 +4229,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4149,9 +4244,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4167,9 +4264,13 @@ msgstr "隐藏商店消息"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4182,7 +4283,8 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4201,9 +4303,12 @@ msgstr "将所有密语放于标签夜"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4214,7 +4319,8 @@ msgstr "在调试页记录魔法信息"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4227,9 +4333,11 @@ msgstr "在调试选项卡中显示服务器的消息"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4254,9 +4362,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4267,7 +4377,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4280,7 +4391,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4293,7 +4406,9 @@ msgstr "启用战斗“选项卡"
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4319,7 +4434,10 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4354,7 +4472,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4367,7 +4486,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4380,9 +4500,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4471,11 +4594,6 @@ msgid "Unassign"
 msgstr "取消分配"
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "预设"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr ""
@@ -5760,70 +5878,70 @@ msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr "攻击暴徒"
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "邀请用户%s加入公会%s."
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "退出公会%s的请求."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr "会员邀请到公会"
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "你要邀请谁加入工会%s?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr "离开公会?"
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "你确定要离开工会%s吗?"
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
@@ -5835,41 +5953,41 @@ msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr "邀请用户%s加入团队."
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr "离开团队?"
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
@@ -5881,17 +5999,17 @@ msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
@@ -6124,10 +6242,8 @@ msgstr ""
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "建立"
 
@@ -6244,8 +6360,7 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ">"
 
@@ -6263,8 +6378,7 @@ msgstr "请分发%d点数"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr "<"
 
@@ -6290,8 +6404,7 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr ""
 
@@ -6456,11 +6569,6 @@ msgid "Yes"
 msgstr "是"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr ""
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr ""
@@ -6492,8 +6600,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr "连接"
 
@@ -6562,8 +6669,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr ""
 
@@ -6857,15 +6964,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7267,173 +7372,138 @@ msgid "Up"
 msgstr "升级"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr "技能点: %d个"
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr "技能为%d"
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr "等级: %d"
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
-msgstr "邀请"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
+msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "接受%s团队的邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "拒绝%s的团队邀请."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "已接受公会邀请来自%s."
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "拒绝%s的公会邀请."
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr "创建公会的名为%s."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr "创建团队名字为%s的."
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr "公会名称"
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr "选择你的公会的名字."
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s邀请你加入公会%s."
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr "接受邀请"
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr "接受到一个已经存在的帮会邀请."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr "您已被邀请您加入党."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "您已被邀请加入%s的团队."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s已经邀请你加入他们的帮会."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s已经邀请你加入帮会%s."
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr "接受帮会邀请"
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr "无法建立团队.您已经在一个队伍中了"
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr ""
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr "选择n的名称."
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7573,8 +7643,7 @@ msgstr "你没有足够的钱币."
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品."
 
 #. TRANSLATORS: trade error
@@ -7660,25 +7729,25 @@ msgstr "选择世界"
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7686,7 +7755,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -9002,7 +9071,9 @@ msgstr ""
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
-msgstr "你被暂时禁止进入游戏直到%s.\n请通过论坛联系GM组."
+msgstr ""
+"你被暂时禁止进入游戏直到%s.\n"
+"请通过论坛联系GM组."
 
 #. TRANSLATORS: error message
 #: src/net/ea/loginrecv.cpp:152 src/net/eathena/loginrecv.cpp:93
@@ -10572,30 +10643,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr ""
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -10606,11 +10677,6 @@ msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr ""
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr ""
@@ -10685,3 +10751,27 @@ msgstr ""
 #, c-format
 msgid "%d seconds"
 msgstr ""
+
+#~ msgid "Guild name is missing."
+#~ msgstr "公会名称缺失."
+
+#~ msgid "Invite"
+#~ msgstr "邀请"
+
+#~ msgid "Creating guild called %s."
+#~ msgstr "创建公会的名为%s."
+
+#~ msgid "Creating party called %s."
+#~ msgstr "创建团队名字为%s的."
+
+#~ msgid "Guild Name"
+#~ msgstr "公会名称"
+
+#~ msgid "Choose your guild's name."
+#~ msgstr "选择你的公会的名字."
+
+#~ msgid "Cannot create party. You are already in a party"
+#~ msgstr "无法建立团队.您已经在一个队伍中了"
+
+#~ msgid "Choose your party's name."
+#~ msgstr "选择n的名称."
diff --git a/po/zh_HK.po b/po/zh_HK.po
index df772841c..701590053 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011
 # Pak Long Wu <paklongwu1006@gmail.com>, 2015
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2016-08-13 17:42+0300\n"
+"POT-Creation-Date: 2016-08-18 22:55+0300\n"
 "PO-Revision-Date: 2016-08-15 08:40+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"
+"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/akaras/manaplus/"
+"language/zh_HK/)\n"
+"Language: zh_HK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. TRANSLATORS: file uploaded message
@@ -30,7 +31,6 @@ msgstr "檔案上載成功"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: item amount window button
 #. TRANSLATORS: quit dialog button
-#. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
 #: src/actions/actions.cpp:167 src/client.cpp:1575 src/client.cpp:1610
@@ -50,10 +50,9 @@ msgstr "檔案上載成功"
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:209
 #: src/gui/windows/itemamountwindow.cpp:190 src/gui/windows/quitdialog.cpp:67
-#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/socialwindow.cpp:531
-#: src/gui/windows/textdialog.cpp:53 src/net/ea/charserverrecv.cpp:108
-#: src/net/ea/charserverrecv.cpp:134 src/net/ea/gamerecv.cpp:71
-#: src/net/eathena/charserverrecv.cpp:423
+#: src/gui/windows/registerdialog.cpp:256 src/gui/windows/textdialog.cpp:53
+#: src/net/ea/charserverrecv.cpp:108 src/net/ea/charserverrecv.cpp:134
+#: src/net/ea/gamerecv.cpp:71 src/net/eathena/charserverrecv.cpp:423
 #: src/net/eathena/charserverrecv.cpp:458
 #: src/net/eathena/charserverrecv.cpp:486 src/net/tmwa/charserverrecv.cpp:305
 msgid "OK"
@@ -102,80 +101,85 @@ msgid "Uploaded log into:"
 msgstr "已把日誌上傳至:"
 
 #. TRANSLATORS: last seen disabled warning
-#: src/actions/actions.cpp:1737
+#: src/actions/actions.cpp:1739
 msgid ""
 "Last seen disabled. Enable in players / collect players id and seen log."
 msgstr ""
 
 #. TRANSLATORS: last seen error
-#: src/actions/actions.cpp:1756 src/actions/actions.cpp:1770
+#: src/actions/actions.cpp:1758 src/actions/actions.cpp:1772
 msgid "You not saw this nick."
 msgstr ""
 
 #. TRANSLATORS: last seen message
-#: src/actions/actions.cpp:1762
+#: src/actions/actions.cpp:1764
 #, c-format
 msgid "Last seen for %s: %s"
 msgstr ""
 
 #. TRANSLATORS: whisper send
-#: src/actions/chat.cpp:266
+#: src/actions/chat.cpp:268
 msgid "Cannot send empty whisper or channel message!"
 msgstr ""
 
 #. TRANSLATORS: new whisper or channel query
-#: src/actions/chat.cpp:315
+#: src/actions/chat.cpp:317
 #, c-format
 msgid "Cannot create a whisper tab \"%s\"! It probably already exists."
 msgstr "無法創建悄悄話標籤“%s”!它可能已經存在."
 
-#. TRANSLATORS: create party message
-#. TRANSLATORS: chat error message
-#: src/actions/chat.cpp:340 src/gui/widgets/tabs/chat/partytab.cpp:72
-msgid "Party name is missing."
-msgstr "欠缺隊伍名稱."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create party
+#: src/actions/chat.cpp:342 src/gui/popups/popupmenu.cpp:3408
+#, fuzzy
+msgid "Create party"
+msgstr "選擇隊伍"
 
-#. TRANSLATORS: create guild message
-#: src/actions/chat.cpp:363
-msgid "Guild name is missing."
-msgstr "欠缺公會名稱."
+#. TRANSLATORS: dialog header
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: create guild
+#: src/actions/chat.cpp:366 src/gui/popups/popupmenu.cpp:3415
+#, fuzzy
+msgid "Create guild"
+msgstr "建立隊伍"
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: guild invite message
 #. TRANSLATORS: party kick message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:385 src/actions/chat.cpp:418 src/actions/chat.cpp:424
-#: src/actions/chat.cpp:497 src/actions/chat.cpp:532
+#: src/actions/chat.cpp:389 src/actions/chat.cpp:422 src/actions/chat.cpp:428
+#: src/actions/chat.cpp:501 src/actions/chat.cpp:536
 #: src/actions/commands.cpp:99
 msgid "Please specify a name."
 msgstr "請指定一個名字."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Return toggles chat."
 msgstr "確認鍵切換聊天."
 
-#: src/actions/chat.cpp:445
+#: src/actions/chat.cpp:449
 msgid "Message closes chat."
 msgstr "訊息關閉聊天."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:457
+#: src/actions/chat.cpp:461
 msgid "Return now toggles chat."
 msgstr "確認鍵現在會切換聊天."
 
 #. TRANSLATORS: message from toggle chat command
-#: src/actions/chat.cpp:467
+#: src/actions/chat.cpp:471
 msgid "Message now closes chat."
 msgstr "訊息現在會關閉聊天."
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:620
+#: src/actions/chat.cpp:624
 msgid "no hat equipped."
 msgstr ""
 
 #. TRANSLATORS: equipped hat chat message
-#: src/actions/chat.cpp:626
+#: src/actions/chat.cpp:630
 #, c-format
 msgid "equipped hat %s."
 msgstr "已準備帽子 %s."
@@ -448,8 +452,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:2517
-#: src/gui/popups/popupmenu.cpp:2559
+#: src/being/playerrelations.cpp:471 src/gui/popups/popupmenu.cpp:2633
+#: src/gui/popups/popupmenu.cpp:2675
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -533,8 +537,8 @@ msgstr "說明"
 #. TRANSLATORS: shop window button
 #: src/client.cpp:894 src/client.cpp:1489 src/client.cpp:1508
 #: src/dyetool/client.cpp:510 src/gui/dialogsmanager.cpp:116
-#: src/gui/popups/popupmenu.cpp:751 src/gui/popups/popupmenu.cpp:828
-#: src/gui/popups/popupmenu.cpp:1082 src/gui/windows/didyouknowwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:768 src/gui/popups/popupmenu.cpp:845
+#: src/gui/popups/popupmenu.cpp:1099 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:267
 #: src/gui/windows/inventorywindow.cpp:290
 #: src/gui/windows/maileditwindow.cpp:53 src/gui/windows/mailviewwindow.cpp:61
@@ -1236,15 +1240,14 @@ msgstr "訊息"
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:2894
+#: src/gui/dialogsmanager.cpp:148 src/gui/popups/popupmenu.cpp:3010
 msgid "Revive"
 msgstr "復活"
 
 #. TRANSLATORS: weight message
 #: src/gui/dialogsmanager.cpp:178
 msgid ""
-"You are carrying more than half your weight. You are unable to regain "
-"health."
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr "您在攜帶超過體重一半的物品.你將無法回復生命值."
 
 #. TRANSLATORS: weight message
@@ -1261,8 +1264,7 @@ msgstr "您在攜帶少於體重一半的物品.你可以回復生命值了."
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:32
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
-#: src/gui/windows/equipmentwindow.cpp:663
-#: src/gui/windows/serverdialog.cpp:597
+#: src/gui/windows/equipmentwindow.cpp:663 src/gui/windows/serverdialog.cpp:597
 msgid "default"
 msgstr "默認"
 
@@ -1423,8 +1425,8 @@ msgstr "巨型 (23)"
 
 #. TRANSLATORS: language
 #. TRANSLATORS: popup menu header
-#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2144
-#: src/gui/popups/popupmenu.cpp:2224 src/gui/widgets/tabs/socialtabbase.h:50
+#: src/gui/models/langlistmodel.h:45 src/gui/popups/popupmenu.cpp:2161
+#: src/gui/popups/popupmenu.cpp:2241 src/gui/widgets/tabs/socialtabbase.h:50
 msgid "(default)"
 msgstr "(默認)"
 
@@ -1730,8 +1732,8 @@ msgstr "聊天室：%s"
 #. TRANSLATORS: skill level
 #. TRANSLATORS: status bar label
 #. TRANSLATORS: status window label
-#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2411
-#: src/gui/popups/skillpopup.cpp:128 src/gui/windows/ministatuswindow.cpp:364
+#: src/gui/popups/beingpopup.cpp:258 src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/skillpopup.cpp:147 src/gui/windows/ministatuswindow.cpp:364
 #: src/gui/windows/statuswindow.cpp:72 src/gui/windows/statuswindow.cpp:261
 #: src/gui/windows/statuswindow.cpp:356
 #, c-format
@@ -1750,58 +1752,6 @@ msgstr ""
 msgid "Particles: %u"
 msgstr ""
 
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: party creation message
-#: src/gui/popups/createpartypopup.h:50 src/gui/windows/socialwindow.cpp:527
-msgid "Create Party"
-msgstr "選擇隊伍"
-
-#. TRANSLATORS: party popup item
-#. TRANSLATORS: popup menu item
-#. TRANSLATORS: close menu
-#. TRANSLATORS: shop window button
-#. TRANSLATORS: button in change email dialog
-#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char create dialog button
-#. TRANSLATORS: connection dialog button
-#. TRANSLATORS: edit server dialog button
-#. TRANSLATORS: item amount window button
-#. TRANSLATORS: quit dialog button
-#. TRANSLATORS: register dialog. button.
-#. TRANSLATORS: setup button
-#. TRANSLATORS: command editor button
-#. TRANSLATORS: text dialog button
-#. TRANSLATORS: updater window button
-#. TRANSLATORS: input action name
-#: src/gui/popups/createpartypopup.h:53 src/gui/popups/popupmenu.cpp:447
-#: src/gui/popups/popupmenu.cpp:515 src/gui/popups/popupmenu.cpp:620
-#: src/gui/popups/popupmenu.cpp:674 src/gui/popups/popupmenu.cpp:709
-#: src/gui/popups/popupmenu.cpp:756 src/gui/popups/popupmenu.cpp:781
-#: src/gui/popups/popupmenu.cpp:806 src/gui/popups/popupmenu.cpp:1003
-#: src/gui/popups/popupmenu.cpp:1030 src/gui/popups/popupmenu.cpp:1068
-#: src/gui/popups/popupmenu.cpp:1132 src/gui/popups/popupmenu.cpp:1861
-#: src/gui/popups/popupmenu.cpp:1901 src/gui/popups/popupmenu.cpp:1959
-#: src/gui/popups/popupmenu.cpp:2008 src/gui/popups/popupmenu.cpp:2049
-#: src/gui/popups/popupmenu.cpp:2120 src/gui/popups/popupmenu.cpp:2201
-#: src/gui/popups/popupmenu.cpp:2237 src/gui/popups/popupmenu.cpp:2270
-#: src/gui/popups/popupmenu.cpp:2291 src/gui/popups/popupmenu.cpp:2313
-#: src/gui/popups/popupmenu.cpp:2339 src/gui/popups/popupmenu.cpp:2357
-#: src/gui/popups/popupmenu.cpp:2382 src/gui/popups/popupmenu.cpp:2420
-#: src/gui/popups/popupmenu.cpp:2739 src/gui/popups/popupmenu.cpp:2867
-#: src/gui/popups/popupmenu.cpp:3069 src/gui/popups/popupmenu.cpp:3212
-#: src/gui/popups/popupmenu.cpp:3244 src/gui/windows/buyselldialog.cpp:75
-#: src/gui/windows/changeemaildialog.cpp:56
-#: src/gui/windows/changepassworddialog.cpp:58
-#: src/gui/windows/charcreatedialog.cpp:114
-#: src/gui/windows/connectiondialog.cpp:52
-#: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
-#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
-#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
-#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
-msgid "Cancel"
-msgstr "取消"
-
 #. TRANSLATORS: popup label
 #: src/gui/popups/itempopup.cpp:224
 #, c-format
@@ -1823,7 +1773,7 @@ msgstr "卡片： "
 #. TRANSLATORS: trade with player
 #. TRANSLATORS: trade chat tab name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:175 src/gui/popups/popupmenu.cpp:904
+#: src/gui/popups/popupmenu.cpp:176 src/gui/popups/popupmenu.cpp:921
 #: src/gui/widgets/tabs/chat/tradetab.cpp:39
 #: src/resources/inventory/inventory.cpp:358
 msgid "Trade"
@@ -1837,8 +1787,8 @@ msgstr "交易"
 #. TRANSLATORS: attack player
 #. TRANSLATORS: input action name
 #. TRANSLATORS: Skill type
-#: src/gui/popups/popupmenu.cpp:178 src/gui/popups/popupmenu.cpp:298
-#: src/gui/popups/popupmenu.cpp:907 src/input/pages/basic.cpp:40
+#: src/gui/popups/popupmenu.cpp:179 src/gui/popups/popupmenu.cpp:299
+#: src/gui/popups/popupmenu.cpp:924 src/input/pages/basic.cpp:40
 #: src/resources/skill/skilltypelist.h:35
 msgid "Attack"
 msgstr "攻擊"
@@ -1849,36 +1799,36 @@ msgstr "攻擊"
 #. TRANSLATORS: whisper to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send whisper to player
-#: src/gui/popups/popupmenu.cpp:181 src/gui/popups/popupmenu.cpp:272
-#: src/gui/popups/popupmenu.cpp:538
+#: src/gui/popups/popupmenu.cpp:182 src/gui/popups/popupmenu.cpp:273
+#: src/gui/popups/popupmenu.cpp:555
 msgid "Whisper"
 msgstr "悄悄話"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: heal player
-#: src/gui/popups/popupmenu.cpp:188 src/gui/popups/popupmenu.cpp:912
-#: src/gui/popups/popupmenu.cpp:2959
+#: src/gui/popups/popupmenu.cpp:189 src/gui/popups/popupmenu.cpp:929
+#: src/gui/popups/popupmenu.cpp:3075
 msgid "Heal"
 msgstr "療癒"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from guild
-#: src/gui/popups/popupmenu.cpp:208 src/gui/popups/popupmenu.cpp:224
-#: src/gui/popups/popupmenu.cpp:589 src/gui/popups/popupmenu.cpp:940
+#: src/gui/popups/popupmenu.cpp:209 src/gui/popups/popupmenu.cpp:225
+#: src/gui/popups/popupmenu.cpp:606 src/gui/popups/popupmenu.cpp:957
 msgid "Kick from guild"
 msgstr "從公會踢出"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: change player position in guild
-#: src/gui/popups/popupmenu.cpp:215 src/gui/popups/popupmenu.cpp:231
-#: src/gui/popups/popupmenu.cpp:596 src/gui/popups/popupmenu.cpp:947
+#: src/gui/popups/popupmenu.cpp:216 src/gui/popups/popupmenu.cpp:232
+#: src/gui/popups/popupmenu.cpp:613 src/gui/popups/popupmenu.cpp:964
 msgid "Change pos in guild"
 msgstr "更改公會職位"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to guild
-#: src/gui/popups/popupmenu.cpp:244 src/gui/popups/popupmenu.cpp:608
-#: src/gui/popups/popupmenu.cpp:961
+#: src/gui/popups/popupmenu.cpp:245 src/gui/popups/popupmenu.cpp:625
+#: src/gui/popups/popupmenu.cpp:978
 msgid "Invite to guild"
 msgstr "邀請至公會"
 
@@ -1886,7 +1836,7 @@ msgstr "邀請至公會"
 #. TRANSLATORS: set player invisible for self by id
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: nuke player
-#: src/gui/popups/popupmenu.cpp:251 src/gui/popups/popupmenu.cpp:2930
+#: src/gui/popups/popupmenu.cpp:252 src/gui/popups/popupmenu.cpp:3046
 msgid "Nuke"
 msgstr "清除"
 
@@ -1903,9 +1853,9 @@ msgstr "清除"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move to player location
 #. TRANSLATORS: input tab sub tab name
-#: src/gui/popups/popupmenu.cpp:254 src/gui/popups/popupmenu.cpp:286
-#: src/gui/popups/popupmenu.cpp:570 src/gui/popups/popupmenu.cpp:737
-#: src/gui/popups/popupmenu.cpp:919 src/gui/popups/popupmenu.cpp:988
+#: src/gui/popups/popupmenu.cpp:255 src/gui/popups/popupmenu.cpp:287
+#: src/gui/popups/popupmenu.cpp:587 src/gui/popups/popupmenu.cpp:754
+#: src/gui/popups/popupmenu.cpp:936 src/gui/popups/popupmenu.cpp:1005
 #: src/gui/setupinputpages.cpp:48
 msgid "Move"
 msgstr "移動"
@@ -1914,7 +1864,7 @@ msgstr "移動"
 #. TRANSLATORS: talk with npc
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:266 src/input/pages/basic.cpp:88
+#: src/gui/popups/popupmenu.cpp:267 src/input/pages/basic.cpp:88
 #: src/resources/db/npcdb.cpp:152
 msgid "Talk"
 msgstr "對話"
@@ -1929,7 +1879,7 @@ msgstr "對話"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:276 src/gui/popups/popupmenu.cpp:2589
+#: src/gui/popups/popupmenu.cpp:277 src/gui/popups/popupmenu.cpp:2705
 #: src/gui/windows/buydialog.cpp:191 src/gui/windows/buydialog.cpp:210
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/buydialog.cpp:285
 #: src/gui/windows/buyselldialog.cpp:71 src/gui/windows/shopwindow.cpp:162
@@ -1947,7 +1897,7 @@ msgstr "購買"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #. TRANSLATORS: npc context menu item
-#: src/gui/popups/popupmenu.cpp:279 src/gui/popups/popupmenu.cpp:2601
+#: src/gui/popups/popupmenu.cpp:280 src/gui/popups/popupmenu.cpp:2717
 #: 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:164 src/input/pages/basic.cpp:256
@@ -1959,26 +1909,26 @@ msgstr "出售"
 #. TRANSLATORS: add comment to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add comment to player
-#: src/gui/popups/popupmenu.cpp:289 src/gui/popups/popupmenu.cpp:549
-#: src/gui/popups/popupmenu.cpp:2699
+#: src/gui/popups/popupmenu.cpp:290 src/gui/popups/popupmenu.cpp:566
+#: src/gui/popups/popupmenu.cpp:2815
 msgid "Add comment"
 msgstr "添加評論"
 
 #. TRANSLATORS: remove monster from attack list
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:313
+#: src/gui/popups/popupmenu.cpp:314
 msgid "Remove from attack list"
 msgstr "從攻擊清單中移除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to priotiry attack list
-#: src/gui/popups/popupmenu.cpp:320
+#: src/gui/popups/popupmenu.cpp:321
 msgid "Add to priority attack list"
 msgstr "加至優先攻擊清單"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add monster to attack list
-#: src/gui/popups/popupmenu.cpp:324
+#: src/gui/popups/popupmenu.cpp:325
 msgid "Add to attack list"
 msgstr "加至攻擊列表"
 
@@ -1986,19 +1936,19 @@ msgstr "加至攻擊列表"
 #. TRANSLATORS: add monster to ignore list
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to pickup list
-#: src/gui/popups/popupmenu.cpp:328 src/gui/popups/popupmenu.cpp:2721
+#: src/gui/popups/popupmenu.cpp:329 src/gui/popups/popupmenu.cpp:2837
 msgid "Add to ignore list"
 msgstr "加至忽略列表"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
-#: src/gui/popups/popupmenu.cpp:337 src/gui/popups/popupmenu.cpp:354
+#: src/gui/popups/popupmenu.cpp:338 src/gui/popups/popupmenu.cpp:355
 msgid "Move to master"
 msgstr "移動至主人"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
-#: src/gui/popups/popupmenu.cpp:342
+#: src/gui/popups/popupmenu.cpp:343
 msgid "Fire"
 msgstr "開火"
 
@@ -2006,7 +1956,7 @@ msgstr "開火"
 #. TRANSLATORS: feed homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: feed pet
-#: src/gui/popups/popupmenu.cpp:357 src/gui/popups/popupmenu.cpp:376
+#: src/gui/popups/popupmenu.cpp:358 src/gui/popups/popupmenu.cpp:377
 msgid "Feed"
 msgstr "餵食"
 
@@ -2016,8 +1966,8 @@ msgstr "餵食"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: character rename button
 #. TRANSLATORS: shop window button
-#: src/gui/popups/popupmenu.cpp:361 src/gui/popups/popupmenu.cpp:387
-#: src/gui/popups/popupmenu.cpp:694 src/gui/windows/charselectdialog.cpp:105
+#: src/gui/popups/popupmenu.cpp:362 src/gui/popups/popupmenu.cpp:388
+#: src/gui/popups/popupmenu.cpp:711 src/gui/windows/charselectdialog.cpp:105
 #: src/gui/windows/shopwindow.cpp:186
 msgid "Rename"
 msgstr "重新命名"
@@ -2026,13 +1976,13 @@ msgstr "重新命名"
 #. TRANSLATORS: delete homunculus
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kill player
-#: src/gui/popups/popupmenu.cpp:365 src/gui/popups/popupmenu.cpp:2933
+#: src/gui/popups/popupmenu.cpp:366 src/gui/popups/popupmenu.cpp:3049
 msgid "Kill"
 msgstr "殺死"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet drop loot
-#: src/gui/popups/popupmenu.cpp:379
+#: src/gui/popups/popupmenu.cpp:380
 msgid "Drop loot"
 msgstr "丟棄"
 
@@ -2040,7 +1990,7 @@ msgstr "丟棄"
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:382 src/gui/windows/equipmentwindow.cpp:73
+#: src/gui/popups/popupmenu.cpp:383 src/gui/windows/equipmentwindow.cpp:73
 #: src/gui/windows/inventorywindow.cpp:202 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
@@ -2053,7 +2003,7 @@ msgstr "卸下裝備"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pet return to egg
-#: src/gui/popups/popupmenu.cpp:401 src/resources/db/petdb.cpp:160
+#: src/gui/popups/popupmenu.cpp:402 src/resources/db/petdb.cpp:160
 msgid "Return to egg"
 msgstr "返回蛋裏"
 
@@ -2061,39 +2011,88 @@ msgstr "返回蛋裏"
 #. TRANSLATORS: add being name to chat
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player name to chat
-#: src/gui/popups/popupmenu.cpp:442 src/gui/popups/popupmenu.cpp:616
+#: src/gui/popups/popupmenu.cpp:443 src/gui/popups/popupmenu.cpp:633
 msgid "Add name to chat"
 msgstr "把名字加至對話"
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: close menu
+#. TRANSLATORS: shop window button
+#. TRANSLATORS: button in change email dialog
+#. TRANSLATORS: change password dialog button
+#. TRANSLATORS: char create dialog button
+#. TRANSLATORS: connection dialog button
+#. TRANSLATORS: edit server dialog button
+#. TRANSLATORS: item amount window button
+#. TRANSLATORS: quit dialog button
+#. TRANSLATORS: register dialog. button.
+#. TRANSLATORS: setup button
+#. TRANSLATORS: command editor button
+#. TRANSLATORS: text dialog button
+#. TRANSLATORS: updater window button
+#. TRANSLATORS: input action name
+#: src/gui/popups/popupmenu.cpp:448 src/gui/popups/popupmenu.cpp:532
+#: src/gui/popups/popupmenu.cpp:637 src/gui/popups/popupmenu.cpp:691
+#: src/gui/popups/popupmenu.cpp:726 src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:798 src/gui/popups/popupmenu.cpp:823
+#: src/gui/popups/popupmenu.cpp:1020 src/gui/popups/popupmenu.cpp:1047
+#: src/gui/popups/popupmenu.cpp:1085 src/gui/popups/popupmenu.cpp:1149
+#: src/gui/popups/popupmenu.cpp:1878 src/gui/popups/popupmenu.cpp:1918
+#: src/gui/popups/popupmenu.cpp:1976 src/gui/popups/popupmenu.cpp:2025
+#: src/gui/popups/popupmenu.cpp:2066 src/gui/popups/popupmenu.cpp:2137
+#: src/gui/popups/popupmenu.cpp:2218 src/gui/popups/popupmenu.cpp:2254
+#: src/gui/popups/popupmenu.cpp:2287 src/gui/popups/popupmenu.cpp:2308
+#: src/gui/popups/popupmenu.cpp:2330 src/gui/popups/popupmenu.cpp:2356
+#: src/gui/popups/popupmenu.cpp:2374 src/gui/popups/popupmenu.cpp:2411
+#: src/gui/popups/popupmenu.cpp:2459 src/gui/popups/popupmenu.cpp:2494
+#: src/gui/popups/popupmenu.cpp:2536 src/gui/popups/popupmenu.cpp:2855
+#: src/gui/popups/popupmenu.cpp:2983 src/gui/popups/popupmenu.cpp:3185
+#: src/gui/popups/popupmenu.cpp:3328 src/gui/popups/popupmenu.cpp:3360
+#: src/gui/popups/popupmenu.cpp:3426 src/gui/popups/popupmenu.cpp:3436
+#: src/gui/popups/popupmenu.cpp:3446 src/gui/popups/popupmenu.cpp:3456
+#: src/gui/popups/popupmenu.cpp:3466 src/gui/popups/popupmenu.cpp:3476
+#: src/gui/popups/popupmenu.cpp:3486 src/gui/windows/buyselldialog.cpp:75
+#: src/gui/windows/changeemaildialog.cpp:56
+#: src/gui/windows/changepassworddialog.cpp:58
+#: src/gui/windows/charcreatedialog.cpp:114
+#: src/gui/windows/connectiondialog.cpp:52
+#: src/gui/windows/editserverdialog.cpp:61
+#: src/gui/windows/itemamountwindow.cpp:192 src/gui/windows/quitdialog.cpp:69
+#: src/gui/windows/registerdialog.cpp:64 src/gui/windows/setupwindow.cpp:101
+#: src/gui/windows/textcommandeditor.cpp:98 src/gui/windows/textdialog.cpp:60
+#: src/gui/windows/updaterwindow.cpp:190 src/input/pages/gui.cpp:103
+msgid "Cancel"
+msgstr "取消"
+
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: settings tab name
-#: src/gui/popups/popupmenu.cpp:492 src/gui/widgets/tabs/setup_players.cpp:59
+#: src/gui/popups/popupmenu.cpp:509 src/gui/widgets/tabs/setup_players.cpp:59
 msgid "Players"
 msgstr "玩家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick player from party
-#: src/gui/popups/popupmenu.cpp:561 src/gui/popups/popupmenu.cpp:2642
-#: src/gui/popups/popupmenu.cpp:2667
+#: src/gui/popups/popupmenu.cpp:578 src/gui/popups/popupmenu.cpp:2758
+#: src/gui/popups/popupmenu.cpp:2783
 msgid "Kick from party"
 msgstr "從隊伍踢出"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: pickup item from ground
-#: src/gui/popups/popupmenu.cpp:654 src/gui/popups/popupmenu.cpp:663
+#: src/gui/popups/popupmenu.cpp:671 src/gui/popups/popupmenu.cpp:680
 msgid "Pick up"
 msgstr "拿起物品"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item name to chat
-#: src/gui/popups/popupmenu.cpp:668 src/gui/popups/popupmenu.cpp:1857
-#: src/gui/popups/popupmenu.cpp:1944 src/gui/popups/popupmenu.cpp:1992
-#: src/gui/popups/popupmenu.cpp:2265
+#: src/gui/popups/popupmenu.cpp:685 src/gui/popups/popupmenu.cpp:1874
+#: src/gui/popups/popupmenu.cpp:1961 src/gui/popups/popupmenu.cpp:2009
+#: src/gui/popups/popupmenu.cpp:2282
 msgid "Add to chat"
 msgstr "加至對話"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:691 src/gui/popups/popupmenu.cpp:727
+#: src/gui/popups/popupmenu.cpp:708 src/gui/popups/popupmenu.cpp:744
 msgid "Map Item"
 msgstr "地圖物件"
 
@@ -2103,28 +2102,28 @@ msgstr "地圖物件"
 #. TRANSLATORS: remove attack target
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup filter
-#: src/gui/popups/popupmenu.cpp:697 src/gui/popups/popupmenu.cpp:2197
-#: src/gui/popups/popupmenu.cpp:2233
+#: src/gui/popups/popupmenu.cpp:714 src/gui/popups/popupmenu.cpp:2214
+#: src/gui/popups/popupmenu.cpp:2250
 msgid "Remove"
 msgstr "清除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to map item
 #. TRANSLATORS: warp select button
-#: src/gui/popups/popupmenu.cpp:704 src/gui/popups/popupmenu.cpp:733
+#: src/gui/popups/popupmenu.cpp:721 src/gui/popups/popupmenu.cpp:750
 #: src/net/eathena/skillrecv.cpp:435
 msgid "Warp"
 msgstr "傳送"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move camera to map item
-#: src/gui/popups/popupmenu.cpp:740
+#: src/gui/popups/popupmenu.cpp:757
 msgid "Move camera"
 msgstr "移動鏡頭"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore camera to default view
-#: src/gui/popups/popupmenu.cpp:745
+#: src/gui/popups/popupmenu.cpp:762
 msgid "Restore camera"
 msgstr ""
 
@@ -2133,7 +2132,7 @@ msgstr ""
 #. TRANSLATORS: long button name for outfits window.
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
-#: src/gui/popups/popupmenu.cpp:770 src/gui/setupinputpages.cpp:58
+#: src/gui/popups/popupmenu.cpp:787 src/gui/setupinputpages.cpp:58
 #: src/gui/windowmenu.cpp:155 src/gui/windows/inventorywindow.cpp:231
 #: src/gui/windows/outfitwindow.cpp:60
 msgid "Outfits"
@@ -2141,69 +2140,68 @@ msgstr "裝備"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: clear selected outfit
-#: src/gui/popups/popupmenu.cpp:773
+#: src/gui/popups/popupmenu.cpp:790
 msgid "Clear outfit"
 msgstr "清除裝備"
 
 #. TRANSLATORS: popup menu header
 #. TRANSLATORS: long button name for spells window.
-#: src/gui/popups/popupmenu.cpp:799 src/gui/windowmenu.cpp:136
+#: src/gui/popups/popupmenu.cpp:816 src/gui/windowmenu.cpp:136
 msgid "Spells"
 msgstr "咒語"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: edit selected spell
-#: src/gui/popups/popupmenu.cpp:802
+#: src/gui/popups/popupmenu.cpp:819
 msgid "Edit spell"
 msgstr "編輯咒語"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove all text from chat tab
 #. TRANSLATORS: npc dialog button
-#: src/gui/popups/popupmenu.cpp:833 src/gui/windows/npcdialog.cpp:125
+#: src/gui/popups/popupmenu.cpp:850 src/gui/windows/npcdialog.cpp:125
 msgid "Clear"
 msgstr "清除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:840
+#: src/gui/popups/popupmenu.cpp:857
 msgid "Disable highlight"
 msgstr "關閉高亮"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable chat tab highlight
-#: src/gui/popups/popupmenu.cpp:846
+#: src/gui/popups/popupmenu.cpp:863
 msgid "Enable highlight"
 msgstr "開啟高亮"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: do not remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:852
+#: src/gui/popups/popupmenu.cpp:869
 msgid "Don't remove name"
 msgstr "不要清除名字"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player names from chat tab
-#: src/gui/popups/popupmenu.cpp:858
+#: src/gui/popups/popupmenu.cpp:875
 msgid "Remove name"
 msgstr "清除名字"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:864
+#: src/gui/popups/popupmenu.cpp:881
 msgid "Enable away"
 msgstr "開啟暫離鍵盤"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disable away messages in chat tab
-#: src/gui/popups/popupmenu.cpp:870
+#: src/gui/popups/popupmenu.cpp:887
 msgid "Disable away"
 msgstr "關閉暫離鍵盤"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable away messages in chat tab
-#. TRANSLATORS: social window button
-#: src/gui/popups/popupmenu.cpp:877 src/gui/windows/socialwindow.cpp:81
+#: src/gui/popups/popupmenu.cpp:894
 msgid "Leave"
 msgstr "離開"
 
@@ -2213,116 +2211,116 @@ msgstr "離開"
 #. TRANSLATORS: copy link to clipboard
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy npc text to clipboard
-#: src/gui/popups/popupmenu.cpp:882 src/gui/popups/popupmenu.cpp:2309
-#: src/gui/popups/popupmenu.cpp:2353
+#: src/gui/popups/popupmenu.cpp:899 src/gui/popups/popupmenu.cpp:2326
+#: src/gui/popups/popupmenu.cpp:2370
 msgid "Copy to clipboard"
 msgstr "複製至剪貼板"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1012
+#: src/gui/popups/popupmenu.cpp:1029
 msgid "Change guild position"
 msgstr "改變公會職位"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1062
+#: src/gui/popups/popupmenu.cpp:1079
 msgid "window"
 msgstr "視窗"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: unlock window
-#: src/gui/popups/popupmenu.cpp:1091
+#: src/gui/popups/popupmenu.cpp:1108
 msgid "Unlock"
 msgstr "解鎖"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: lock window
-#: src/gui/popups/popupmenu.cpp:1097
+#: src/gui/popups/popupmenu.cpp:1114
 msgid "Lock"
 msgstr "鎖定"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:1108
+#: src/gui/popups/popupmenu.cpp:1125
 msgid "Show emotes for:"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for player
 #. TRANSLATORS: settings group
-#: src/gui/popups/popupmenu.cpp:1112 src/gui/widgets/tabs/setup_other.cpp:226
+#: src/gui/popups/popupmenu.cpp:1129 src/gui/widgets/tabs/setup_other.cpp:226
 msgid "Player"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for pet
-#: src/gui/popups/popupmenu.cpp:1116
+#: src/gui/popups/popupmenu.cpp:1133
 msgid "Pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for homuncules
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1122 src/gui/userpalette.cpp:208
+#: src/gui/popups/popupmenu.cpp:1139 src/gui/userpalette.cpp:208
 msgid "Homunculus"
 msgstr "小矮人"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show emotes for mercenary
 #. TRANSLATORS: palette color
-#: src/gui/popups/popupmenu.cpp:1126 src/gui/userpalette.cpp:203
+#: src/gui/popups/popupmenu.cpp:1143 src/gui/userpalette.cpp:203
 msgid "Mercenary"
 msgstr "傭兵"
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1184
+#: src/gui/popups/popupmenu.cpp:1201
 msgid "Rename map sign          "
 msgstr "清除地圖標誌             "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1187
+#: src/gui/popups/popupmenu.cpp:1204
 msgid "Name:                    "
 msgstr "名字:                    "
 
 #. TRANSLATORS: dialog caption
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1202
+#: src/gui/popups/popupmenu.cpp:1219
 msgid "Player comment            "
 msgstr "玩家評語                  "
 
 #. TRANSLATORS: label
 #. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popups/popupmenu.cpp:1205
+#: src/gui/popups/popupmenu.cpp:1222
 msgid "Comment:                      "
 msgstr "評語:                         "
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add item to trade
-#: src/gui/popups/popupmenu.cpp:1737
+#: src/gui/popups/popupmenu.cpp:1754
 msgid "Add to trade"
 msgstr "加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to trade
-#: src/gui/popups/popupmenu.cpp:1745
+#: src/gui/popups/popupmenu.cpp:1762
 msgid "Add to trade 10"
 msgstr "把 10 加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to trade
-#: src/gui/popups/popupmenu.cpp:1750
+#: src/gui/popups/popupmenu.cpp:1767
 msgid "Add to trade half"
 msgstr "把 一半 加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount except one item to trade
-#: src/gui/popups/popupmenu.cpp:1754
+#: src/gui/popups/popupmenu.cpp:1771
 msgid "Add to trade all-1"
 msgstr "把 全部-1 加至交易"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all amount item to trade
-#: src/gui/popups/popupmenu.cpp:1758
+#: src/gui/popups/popupmenu.cpp:1775
 msgid "Add to trade all"
 msgstr "把 全部 加至交易"
 
@@ -2331,8 +2329,8 @@ msgstr "把 全部 加至交易"
 #. TRANSLATORS: storage button
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
-#: src/gui/popups/popupmenu.cpp:1766 src/gui/popups/popupmenu.cpp:1940
-#: src/gui/popups/popupmenu.cpp:1987 src/gui/windows/inventorywindow.cpp:262
+#: src/gui/popups/popupmenu.cpp:1783 src/gui/popups/popupmenu.cpp:1957
+#: src/gui/popups/popupmenu.cpp:2004 src/gui/windows/inventorywindow.cpp:262
 #: src/gui/windows/inventorywindow.cpp:285
 #: src/gui/windows/inventorywindow.cpp:885 src/gui/windows/setupwindow.cpp:103
 msgid "Store"
@@ -2340,63 +2338,63 @@ msgstr "儲存"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add 10 item amount to storage
-#: src/gui/popups/popupmenu.cpp:1774
+#: src/gui/popups/popupmenu.cpp:1791
 msgid "Store 10"
 msgstr "儲存 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add half item amount to storage
-#: src/gui/popups/popupmenu.cpp:1779
+#: src/gui/popups/popupmenu.cpp:1796
 msgid "Store half"
 msgstr "儲存 一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all except one item to storage
-#: src/gui/popups/popupmenu.cpp:1783
+#: src/gui/popups/popupmenu.cpp:1800
 msgid "Store all-1"
 msgstr "儲存 全部-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add all item amount to storage
-#: src/gui/popups/popupmenu.cpp:1787
+#: src/gui/popups/popupmenu.cpp:1804
 msgid "Store all"
 msgstr "儲存 全部"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sub menu for craft
-#: src/gui/popups/popupmenu.cpp:1800
+#: src/gui/popups/popupmenu.cpp:1817
 msgid "Move to craft..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1809 src/gui/windows/inventorywindow.cpp:264
+#: src/gui/popups/popupmenu.cpp:1826 src/gui/windows/inventorywindow.cpp:264
 #: src/gui/windows/inventorywindow.cpp:287
 msgid "Retrieve"
 msgstr "取回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get 10 item amount from storage
-#: src/gui/popups/popupmenu.cpp:1817
+#: src/gui/popups/popupmenu.cpp:1834
 msgid "Retrieve 10"
 msgstr "取回 10"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get half item amount from storage
-#: src/gui/popups/popupmenu.cpp:1822
+#: src/gui/popups/popupmenu.cpp:1839
 msgid "Retrieve half"
 msgstr "取回 一半"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all except one item amount from storage
-#: src/gui/popups/popupmenu.cpp:1826
+#: src/gui/popups/popupmenu.cpp:1843
 msgid "Retrieve all-1"
 msgstr "取回 全部-1"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get all item amount from storage
-#: src/gui/popups/popupmenu.cpp:1830
+#: src/gui/popups/popupmenu.cpp:1847
 msgid "Retrieve all"
 msgstr "取回 全部"
 
@@ -2407,17 +2405,17 @@ msgstr "取回 全部"
 #. TRANSLATORS: default use button name
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:1894 src/gui/popups/popupmenu.cpp:2793
+#: src/gui/popups/popupmenu.cpp:1911 src/gui/popups/popupmenu.cpp:2909
 #: src/gui/windows/inventorywindow.cpp:200
 #: src/gui/windows/inventorywindow.cpp:784 src/gui/windows/skilldialog.cpp:91
-#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:377
-#: src/gui/windows/skilldialog.cpp:559 src/gui/windows/skilldialog.cpp:646
+#: src/gui/windows/skilldialog.cpp:166 src/gui/windows/skilldialog.cpp:382
+#: src/gui/windows/skilldialog.cpp:564 src/gui/windows/skilldialog.cpp:675
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
 msgid "Use"
 msgstr "使用"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2004
+#: src/gui/popups/popupmenu.cpp:2021
 msgid "Clear drop window"
 msgstr "清除掉下視窗"
 
@@ -2426,43 +2424,43 @@ msgstr "清除掉下視窗"
 #. TRANSLATORS: hide player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: hide npc
-#: src/gui/popups/popupmenu.cpp:2035 src/gui/popups/popupmenu.cpp:2097
-#: src/gui/popups/popupmenu.cpp:2951 src/gui/popups/popupmenu.cpp:2971
-#: src/gui/popups/popupmenu.cpp:3085
+#: src/gui/popups/popupmenu.cpp:2052 src/gui/popups/popupmenu.cpp:2114
+#: src/gui/popups/popupmenu.cpp:3067 src/gui/popups/popupmenu.cpp:3087
+#: src/gui/popups/popupmenu.cpp:3201
 msgid "Hide"
 msgstr "隱藏"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2042 src/gui/popups/popupmenu.cpp:2104
+#: src/gui/popups/popupmenu.cpp:2059 src/gui/popups/popupmenu.cpp:2121
 msgid "Show"
 msgstr "顯示"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2111
+#: src/gui/popups/popupmenu.cpp:2128
 msgid "Open yellow bar settings"
 msgstr "開啟黃色欄設定"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2113
+#: src/gui/popups/popupmenu.cpp:2130
 msgid "Reset yellow bar"
 msgstr "重設黃色欄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy status to chat
 #. TRANSLATORS: status window button
-#: src/gui/popups/popupmenu.cpp:2117 src/gui/windows/statuswindow.cpp:88
+#: src/gui/popups/popupmenu.cpp:2134 src/gui/windows/statuswindow.cpp:88
 msgid "Copy to chat"
 msgstr "複製至對話"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target up
-#: src/gui/popups/popupmenu.cpp:2160 src/gui/popups/popupmenu.cpp:2179
+#: src/gui/popups/popupmenu.cpp:2177 src/gui/popups/popupmenu.cpp:2196
 msgid "Move up"
 msgstr "往上移動"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move attack target down
-#: src/gui/popups/popupmenu.cpp:2166 src/gui/popups/popupmenu.cpp:2185
+#: src/gui/popups/popupmenu.cpp:2183 src/gui/popups/popupmenu.cpp:2202
 msgid "Move down"
 msgstr "往下移動"
 
@@ -2470,175 +2468,244 @@ msgstr "往下移動"
 #. TRANSLATORS: undress item from player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: undress player
-#: src/gui/popups/popupmenu.cpp:2262 src/gui/popups/popupmenu.cpp:2696
+#: src/gui/popups/popupmenu.cpp:2279 src/gui/popups/popupmenu.cpp:2812
 msgid "Undress"
 msgstr "脫衣"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: copy text to clipboard
-#: src/gui/popups/popupmenu.cpp:2284
+#: src/gui/popups/popupmenu.cpp:2301
 msgid "Copy"
 msgstr "複製"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: paste text from clipboard
-#: src/gui/popups/popupmenu.cpp:2287
+#: src/gui/popups/popupmenu.cpp:2304
 msgid "Paste"
 msgstr "貼上"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open link in browser
-#: src/gui/popups/popupmenu.cpp:2306
+#: src/gui/popups/popupmenu.cpp:2323
 msgid "Open link"
 msgstr "開啟連結"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2324
+#: src/gui/popups/popupmenu.cpp:2341
 msgid "Show window"
 msgstr "顯示視窗"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2375
+#: src/gui/popups/popupmenu.cpp:2392
 msgid "Skill"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set skill level
-#: src/gui/popups/popupmenu.cpp:2379
-msgid "Set skill level"
+#: src/gui/popups/popupmenu.cpp:2396
+msgid "Skill level..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast type
+#: src/gui/popups/popupmenu.cpp:2400
+msgid "Skill cast type..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by x
+#: src/gui/popups/popupmenu.cpp:2404
+msgid "Skill offset by x..."
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: set skill cast offset by y
+#: src/gui/popups/popupmenu.cpp:2408
+msgid "Skill offset by y..."
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2433
+msgid "Skill cast offset by x"
+msgstr ""
+
+#. TRANSLATORS: popup menu header
+#: src/gui/popups/popupmenu.cpp:2439
+msgid "Skill cast offset by y"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill level header
+#: src/gui/popups/popupmenu.cpp:2479
+msgid "Select skill level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: skill level
-#: src/gui/popups/popupmenu.cpp:2416
+#: src/gui/popups/popupmenu.cpp:2490
 msgid "Max level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type header
+#: src/gui/popups/popupmenu.cpp:2516
+msgid "Select skill cast type"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: button in input settings tab
+#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/skillpopup.cpp:164
+#: src/gui/widgets/tabs/setup_input.cpp:69
+msgid "Default"
+msgstr "預設"
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: debug window tab
+#: src/gui/popups/popupmenu.cpp:2524 src/gui/popups/skillpopup.cpp:168
+#: src/gui/windows/debugwindow.cpp:63
+msgid "Target"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/popupmenu.cpp:2528 src/gui/popups/skillpopup.cpp:172
+msgid "Mouse position"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: skill cast type
+#. TRANSLATORS: Skill type
+#: src/gui/popups/popupmenu.cpp:2532 src/resources/skill/skilltypelist.h:39
+msgid "Self"
+msgstr ""
+
+#. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to disregarded list
-#: src/gui/popups/popupmenu.cpp:2463 src/gui/popups/popupmenu.cpp:2499
-#: src/gui/popups/popupmenu.cpp:2538 src/gui/popups/popupmenu.cpp:2556
+#: src/gui/popups/popupmenu.cpp:2579 src/gui/popups/popupmenu.cpp:2615
+#: src/gui/popups/popupmenu.cpp:2654 src/gui/popups/popupmenu.cpp:2672
 msgid "Disregard"
 msgstr "無視"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
-#: src/gui/popups/popupmenu.cpp:2466 src/gui/popups/popupmenu.cpp:2502
-#: src/gui/popups/popupmenu.cpp:2541 src/gui/windows/confirmdialog.cpp:62
+#: src/gui/popups/popupmenu.cpp:2582 src/gui/popups/popupmenu.cpp:2618
+#: src/gui/popups/popupmenu.cpp:2657 src/gui/windows/confirmdialog.cpp:62
 msgid "Ignore"
 msgstr "忽略"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to black list
-#: src/gui/popups/popupmenu.cpp:2469 src/gui/popups/popupmenu.cpp:2544
+#: src/gui/popups/popupmenu.cpp:2585 src/gui/popups/popupmenu.cpp:2660
 msgid "Black list"
 msgstr "加至黑名單"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to enemy list
-#: src/gui/popups/popupmenu.cpp:2472 src/gui/popups/popupmenu.cpp:2505
+#: src/gui/popups/popupmenu.cpp:2588 src/gui/popups/popupmenu.cpp:2621
 msgid "Set as enemy"
 msgstr "設為冤家"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to erased list
-#: src/gui/popups/popupmenu.cpp:2475 src/gui/popups/popupmenu.cpp:2508
-#: src/gui/popups/popupmenu.cpp:2520 src/gui/popups/popupmenu.cpp:2529
-#: src/gui/popups/popupmenu.cpp:2547
+#: src/gui/popups/popupmenu.cpp:2591 src/gui/popups/popupmenu.cpp:2624
+#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2645
+#: src/gui/popups/popupmenu.cpp:2663
 msgid "Erase"
 msgstr "擦去"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add player to friends list
-#: src/gui/popups/popupmenu.cpp:2485
+#: src/gui/popups/popupmenu.cpp:2601
 msgid "Be friend"
 msgstr "設為朋友"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove player from ignore list
-#: src/gui/popups/popupmenu.cpp:2496 src/gui/popups/popupmenu.cpp:2514
-#: src/gui/popups/popupmenu.cpp:2526 src/gui/popups/popupmenu.cpp:2535
-#: src/gui/popups/popupmenu.cpp:2553
+#: src/gui/popups/popupmenu.cpp:2612 src/gui/popups/popupmenu.cpp:2630
+#: src/gui/popups/popupmenu.cpp:2642 src/gui/popups/popupmenu.cpp:2651
+#: src/gui/popups/popupmenu.cpp:2669
 msgid "Unignore"
 msgstr "取消忽略"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2572
+#: src/gui/popups/popupmenu.cpp:2688
 msgid "Follow"
 msgstr "跟隨"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: imitate player
-#: src/gui/popups/popupmenu.cpp:2576
+#: src/gui/popups/popupmenu.cpp:2692
 msgid "Imitate"
 msgstr "模仿"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: buy item
-#: src/gui/popups/popupmenu.cpp:2595 src/gui/popups/popupmenu.cpp:2619
+#: src/gui/popups/popupmenu.cpp:2711 src/gui/popups/popupmenu.cpp:2735
 msgid "Buy (?)"
 msgstr "購買 (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: sell item
-#: src/gui/popups/popupmenu.cpp:2607 src/gui/popups/popupmenu.cpp:2622
+#: src/gui/popups/popupmenu.cpp:2723 src/gui/popups/popupmenu.cpp:2738
 msgid "Sell (?)"
 msgstr "出售 (?)"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2636 src/gui/popups/popupmenu.cpp:2661
+#: src/gui/popups/popupmenu.cpp:2752 src/gui/popups/popupmenu.cpp:2777
 msgid "Invite to party"
 msgstr "邀請至隊伍"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: invite player to party
-#: src/gui/popups/popupmenu.cpp:2685
+#: src/gui/popups/popupmenu.cpp:2801
 #, c-format
 msgid "Join chat %s"
 msgstr "加入對話 %s"
 
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2693
+#: src/gui/popups/popupmenu.cpp:2809
 msgid "Show Items"
 msgstr "顯示物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove item from pickup list
-#: src/gui/popups/popupmenu.cpp:2710
+#: src/gui/popups/popupmenu.cpp:2826
 msgid "Remove from pickup list"
 msgstr "從拾起清單中移除"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: popup menu item
-#: src/gui/popups/popupmenu.cpp:2717
+#: src/gui/popups/popupmenu.cpp:2833
 msgid "Add to pickup list"
 msgstr "加至拾起清單"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: remove protection from item
-#: src/gui/popups/popupmenu.cpp:2769
+#: src/gui/popups/popupmenu.cpp:2885
 msgid "Unprotect item"
 msgstr "取消保護物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: add protection to item
-#: src/gui/popups/popupmenu.cpp:2778
+#: src/gui/popups/popupmenu.cpp:2894
 msgid "Protect item"
 msgstr "保護物件"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2808 src/gui/windows/inventorywindow.cpp:215
+#: src/gui/popups/popupmenu.cpp:2924 src/gui/windows/inventorywindow.cpp:215
 #: src/gui/windows/inventorywindow.cpp:893
 msgid "Drop..."
 msgstr "丟棄..."
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop all item amount
-#: src/gui/popups/popupmenu.cpp:2811
+#: src/gui/popups/popupmenu.cpp:2927
 msgid "Drop all"
 msgstr "丟棄全部"
 
@@ -2646,38 +2713,38 @@ msgstr "丟棄全部"
 #. TRANSLATORS: drop item
 #. TRANSLATORS: long button name for drops window.
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2817 src/gui/windowmenu.cpp:140
+#: src/gui/popups/popupmenu.cpp:2933 src/gui/windowmenu.cpp:140
 #: src/gui/windows/inventorywindow.cpp:898
 msgid "Drop"
 msgstr "丟棄"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
-#: src/gui/popups/popupmenu.cpp:2828
+#: src/gui/popups/popupmenu.cpp:2944
 msgid "GM..."
 msgstr "GM..."
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:2836
+#: src/gui/popups/popupmenu.cpp:2952
 #, c-format
 msgid "Show %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player account info
-#: src/gui/popups/popupmenu.cpp:2840
+#: src/gui/popups/popupmenu.cpp:2956
 msgid "Account info"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player level
-#: src/gui/popups/popupmenu.cpp:2843
+#: src/gui/popups/popupmenu.cpp:2959
 msgid "Level"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player stats
-#: src/gui/popups/popupmenu.cpp:2846
+#: src/gui/popups/popupmenu.cpp:2962
 msgid "Stats"
 msgstr ""
 
@@ -2686,7 +2753,7 @@ msgstr ""
 #. TRANSLATORS: long button name for inventory window.
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2849 src/gui/windowmenu.cpp:106
+#: src/gui/popups/popupmenu.cpp:2965 src/gui/windowmenu.cpp:106
 #: src/gui/windows/inventorywindow.cpp:146
 #: src/resources/inventory/inventory.cpp:328
 msgid "Inventory"
@@ -2695,7 +2762,7 @@ msgstr "背包"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show player storage list
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2852 src/resources/inventory/inventory.cpp:333
+#: src/gui/popups/popupmenu.cpp:2968 src/resources/inventory/inventory.cpp:333
 msgid "Storage"
 msgstr ""
 
@@ -2704,7 +2771,7 @@ msgstr ""
 #. TRANSLATORS: long button name for cart window.
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/popups/popupmenu.cpp:2855 src/gui/windowmenu.cpp:110
+#: src/gui/popups/popupmenu.cpp:2971 src/gui/windowmenu.cpp:110
 #: src/gui/windows/inventorywindow.cpp:233
 #: src/resources/inventory/inventory.cpp:343
 msgid "Cart"
@@ -2713,31 +2780,31 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm commands
 #. TRANSLATORS: settings option
-#: src/gui/popups/popupmenu.cpp:2858 src/gui/widgets/tabs/setup_chat.cpp:87
+#: src/gui/popups/popupmenu.cpp:2974 src/gui/widgets/tabs/setup_chat.cpp:87
 msgid "Commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: gm char commands
-#: src/gui/popups/popupmenu.cpp:2861
+#: src/gui/popups/popupmenu.cpp:2977
 msgid "Char commands"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: back to gm menu
-#: src/gui/popups/popupmenu.cpp:2864 src/gui/popups/popupmenu.cpp:3066
+#: src/gui/popups/popupmenu.cpp:2980 src/gui/popups/popupmenu.cpp:3182
 msgid "Back"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: find player position
-#: src/gui/popups/popupmenu.cpp:2878
+#: src/gui/popups/popupmenu.cpp:2994
 msgid "Locate"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: check player ip
-#: src/gui/popups/popupmenu.cpp:2884
+#: src/gui/popups/popupmenu.cpp:3000
 msgid "Check ip"
 msgstr "檢查IP"
 
@@ -2745,7 +2812,7 @@ msgstr "檢查IP"
 #. TRANSLATORS: go to player position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp to npc
-#: src/gui/popups/popupmenu.cpp:2888 src/gui/popups/popupmenu.cpp:3096
+#: src/gui/popups/popupmenu.cpp:3004 src/gui/popups/popupmenu.cpp:3212
 msgid "Goto"
 msgstr "到"
 
@@ -2753,109 +2820,109 @@ msgstr "到"
 #. TRANSLATORS: recall player to current position
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp npc to player location
-#: src/gui/popups/popupmenu.cpp:2891 src/gui/popups/popupmenu.cpp:3090
+#: src/gui/popups/popupmenu.cpp:3007 src/gui/popups/popupmenu.cpp:3206
 msgid "Recall"
 msgstr "召回"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all party members to player location
-#: src/gui/popups/popupmenu.cpp:2906
+#: src/gui/popups/popupmenu.cpp:3022
 msgid "Recall party"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: recall all guild members to player location
-#: src/gui/popups/popupmenu.cpp:2913
+#: src/gui/popups/popupmenu.cpp:3029
 msgid "Recall guild"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: give party leader status
-#: src/gui/popups/popupmenu.cpp:2924
+#: src/gui/popups/popupmenu.cpp:3040
 msgid "Give party leader"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show menu
-#: src/gui/popups/popupmenu.cpp:2939
+#: src/gui/popups/popupmenu.cpp:3055
 msgid "Show..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute menu
-#: src/gui/popups/popupmenu.cpp:2942
+#: src/gui/popups/popupmenu.cpp:3058
 msgid "Mute..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: enable immortal mode for player
-#: src/gui/popups/popupmenu.cpp:2962
+#: src/gui/popups/popupmenu.cpp:3078
 msgid "Immortal"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: send player to jail
-#: src/gui/popups/popupmenu.cpp:2965
+#: src/gui/popups/popupmenu.cpp:3081
 msgid "Jail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: restore player from jail
-#: src/gui/popups/popupmenu.cpp:2968
+#: src/gui/popups/popupmenu.cpp:3084
 msgid "Unjail"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killer
-#: src/gui/popups/popupmenu.cpp:2975
+#: src/gui/popups/popupmenu.cpp:3091
 msgid "Killer"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player as killable
-#: src/gui/popups/popupmenu.cpp:2978
+#: src/gui/popups/popupmenu.cpp:3094
 msgid "Killable"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: set player save position
-#: src/gui/popups/popupmenu.cpp:2981
+#: src/gui/popups/popupmenu.cpp:3097
 msgid "Set save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to save position
-#: src/gui/popups/popupmenu.cpp:2984
+#: src/gui/popups/popupmenu.cpp:3100
 msgid "Warp to save"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: warp player to random position on same map
-#: src/gui/popups/popupmenu.cpp:2987
+#: src/gui/popups/popupmenu.cpp:3103
 msgid "Warp to random"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn player clone
-#: src/gui/popups/popupmenu.cpp:2991
+#: src/gui/popups/popupmenu.cpp:3107
 msgid "Spawn clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave player clone
-#: src/gui/popups/popupmenu.cpp:2994
+#: src/gui/popups/popupmenu.cpp:3110
 msgid "Spawn slave clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn evil player clone
-#: src/gui/popups/popupmenu.cpp:2997
+#: src/gui/popups/popupmenu.cpp:3113
 msgid "Spawn evil clone"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: break guild
-#: src/gui/popups/popupmenu.cpp:3001
+#: src/gui/popups/popupmenu.cpp:3117
 msgid "Break guild"
 msgstr ""
 
@@ -2863,31 +2930,31 @@ msgstr ""
 #. TRANSLATORS: kick player
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: kick monster
-#: src/gui/popups/popupmenu.cpp:3008 src/gui/popups/popupmenu.cpp:3079
-#: src/gui/popups/popupmenu.cpp:3108
+#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3195
+#: src/gui/popups/popupmenu.cpp:3224
 msgid "Kick"
 msgstr "踢走"
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3016
+#: src/gui/popups/popupmenu.cpp:3132
 #, c-format
 msgid "Mute %s"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3024 src/gui/popups/popupmenu.cpp:3028
-#: src/gui/popups/popupmenu.cpp:3032 src/gui/popups/popupmenu.cpp:3036
-#: src/gui/popups/popupmenu.cpp:3040
+#: src/gui/popups/popupmenu.cpp:3140 src/gui/popups/popupmenu.cpp:3144
+#: src/gui/popups/popupmenu.cpp:3148 src/gui/popups/popupmenu.cpp:3152
+#: src/gui/popups/popupmenu.cpp:3156
 #, c-format
 msgid "Mute %d"
 msgstr "靜音 %d"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: mute player
-#: src/gui/popups/popupmenu.cpp:3045 src/gui/popups/popupmenu.cpp:3049
-#: src/gui/popups/popupmenu.cpp:3053 src/gui/popups/popupmenu.cpp:3057
-#: src/gui/popups/popupmenu.cpp:3061
+#: src/gui/popups/popupmenu.cpp:3161 src/gui/popups/popupmenu.cpp:3165
+#: src/gui/popups/popupmenu.cpp:3169 src/gui/popups/popupmenu.cpp:3173
+#: src/gui/popups/popupmenu.cpp:3177
 #, c-format
 msgid "Unmute %d"
 msgstr "取消靜音 %d"
@@ -2896,19 +2963,19 @@ msgstr "取消靜音 %d"
 #. TRANSLATORS: disguise to npc
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: disguise to monster
-#: src/gui/popups/popupmenu.cpp:3093 src/gui/popups/popupmenu.cpp:3120
+#: src/gui/popups/popupmenu.cpp:3209 src/gui/popups/popupmenu.cpp:3236
 msgid "Disguise"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn monster
-#: src/gui/popups/popupmenu.cpp:3111
+#: src/gui/popups/popupmenu.cpp:3227
 msgid "Spawn same"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: spawn slave monster
-#: src/gui/popups/popupmenu.cpp:3117
+#: src/gui/popups/popupmenu.cpp:3233
 msgid "Spawn slave"
 msgstr ""
 
@@ -2920,8 +2987,8 @@ msgstr ""
 #. TRANSLATORS: info message header
 #. TRANSLATORS: info header
 #. TRANSLATORS: info message
-#: src/gui/popups/popupmenu.cpp:3124 src/gui/popups/popupmenu.cpp:3143
-#: src/gui/popups/popupmenu.cpp:3156 src/gui/windows/charselectdialog.cpp:74
+#: src/gui/popups/popupmenu.cpp:3240 src/gui/popups/popupmenu.cpp:3259
+#: src/gui/popups/popupmenu.cpp:3272 src/gui/windows/charselectdialog.cpp:74
 #: src/net/ea/charserverrecv.cpp:130 src/net/eathena/charserverrecv.cpp:419
 #: src/net/eathena/charserverrecv.cpp:455
 msgid "Info"
@@ -2929,63 +2996,82 @@ msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster in current map
-#: src/gui/popups/popupmenu.cpp:3127
+#: src/gui/popups/popupmenu.cpp:3243
 msgid "Search"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show selected monster spawns in all maps
-#: src/gui/popups/popupmenu.cpp:3131
+#: src/gui/popups/popupmenu.cpp:3247
 msgid "Search spawns"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: show who drops item
-#: src/gui/popups/popupmenu.cpp:3146 src/gui/popups/popupmenu.cpp:3159
+#: src/gui/popups/popupmenu.cpp:3262 src/gui/popups/popupmenu.cpp:3275
 msgid "Who drops"
 msgstr ""
 
 #. TRANSLATORS: popup menu header
-#: src/gui/popups/popupmenu.cpp:3166
+#: src/gui/popups/popupmenu.cpp:3282
 msgid "GM commands"
 msgstr "GM命令"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: move current item to craft slot
-#: src/gui/popups/popupmenu.cpp:3239
+#: src/gui/popups/popupmenu.cpp:3355
 #, c-format
 msgid "Move to craft %d"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: open mail dialog
-#: src/gui/popups/popupmenu.cpp:3256
+#: src/gui/popups/popupmenu.cpp:3372
 msgid "Mail to..."
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: catch pet command
-#: src/gui/popups/popupmenu.cpp:3265
+#: src/gui/popups/popupmenu.cpp:3381
 msgid "Taming pet"
 msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: adopt child command
-#: src/gui/popups/popupmenu.cpp:3274
+#: src/gui/popups/popupmenu.cpp:3390
 msgid "Adopt child"
 msgstr ""
 
+#. TRANSLATORS: popup menu item
+#. TRANSLATORS: leave party
+#: src/gui/popups/popupmenu.cpp:3402
+#, fuzzy
+msgid "Leave party"
+msgstr "選擇隊伍"
+
 #. TRANSLATORS: skill level
-#: src/gui/popups/skillpopup.cpp:119
+#: src/gui/popups/skillpopup.cpp:138
 #, c-format
 msgid "Level: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill level for tmw fake skills
-#: src/gui/popups/skillpopup.cpp:135
+#: src/gui/popups/skillpopup.cpp:154
 msgid "Level: Unknown"
 msgstr ""
 
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:176
+#, fuzzy
+msgid "Self position"
+msgstr "改變公會職位"
+
+#. TRANSLATORS: skill cast type
+#: src/gui/popups/skillpopup.cpp:188
+#, fuzzy, c-format
+msgid "Cast type: %s"
+msgstr "隊伍：%s"
+
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: status window tab name
 #: src/gui/setupinputpages.cpp:46 src/gui/windows/statuswindow.cpp:226
@@ -3520,6 +3606,11 @@ msgstr ""
 msgid "Party"
 msgstr ""
 
+#. TRANSLATORS: chat error message
+#: src/gui/widgets/tabs/chat/partytab.cpp:72
+msgid "Party name is missing."
+msgstr "欠缺隊伍名稱."
+
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
 #: src/gui/widgets/tabs/chat/partytab.cpp:99 src/resources/notifications.h:210
@@ -3528,15 +3619,13 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:104
-#: src/resources/notifications.h:214
+#: src/gui/widgets/tabs/chat/partytab.cpp:104 src/resources/notifications.h:214
 msgid "Item sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:109
-#: src/resources/notifications.h:218
+#: src/gui/widgets/tabs/chat/partytab.cpp:109 src/resources/notifications.h:218
 msgid "Item sharing not possible."
 msgstr ""
 
@@ -3547,22 +3636,19 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:150
-#: src/resources/notifications.h:198
+#: src/gui/widgets/tabs/chat/partytab.cpp:150 src/resources/notifications.h:198
 msgid "Experience sharing enabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:155
-#: src/resources/notifications.h:202
+#: src/gui/widgets/tabs/chat/partytab.cpp:155 src/resources/notifications.h:202
 msgid "Experience sharing disabled."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/gui/widgets/tabs/chat/partytab.cpp:160
-#: src/resources/notifications.h:206
+#: src/gui/widgets/tabs/chat/partytab.cpp:160 src/resources/notifications.h:206
 msgid "Experience sharing not possible."
 msgstr ""
 
@@ -4003,15 +4089,15 @@ msgstr ""
 msgid ""
 "Enables aggressive protection of input focus in chat window.\n"
 "\n"
-"Note: no other text inputs will be allowed to receive text input when you typing in chat window."
+"Note: no other text inputs will be allowed to receive text input when you "
+"typing in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: settings colors tab name
 #. TRANSLATORS: emotes tab name
 #: src/gui/widgets/tabs/setup_chat.cpp:67
-#: src/gui/widgets/tabs/setup_colors.cpp:86
-#: src/gui/windows/emotewindow.cpp:117
+#: src/gui/widgets/tabs/setup_colors.cpp:86 src/gui/windows/emotewindow.cpp:117
 msgid "Colors"
 msgstr ""
 
@@ -4035,9 +4121,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:79
 msgid ""
-"Enable this setting to show color selection drop-down in chat window. Chat window will display color selection drop-down.\n"
+"Enable this setting to show color selection drop-down in chat window. Chat "
+"window will display color selection drop-down.\n"
 "\n"
-"It allows one to select default color of outgoing chat messages easily, but also occupies some space in chat window."
+"It allows one to select default color of outgoing chat messages easily, but "
+"also occupies some space in chat window."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4064,9 +4152,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:103
 msgid ""
-"Limits how many characters will be shown in longest lines of text displayed in chat.\n"
+"Limits how many characters will be shown in longest lines of text displayed "
+"in chat.\n"
 "\n"
-"Note: long lines can make client slower. Lines longer than this limit will be truncated."
+"Note: long lines can make client slower. Lines longer than this limit will "
+"be truncated."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4077,7 +4167,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:112
 msgid ""
-"Limits how many lines chat will keep in scrollback buffer. Chat keeps specified number of last lines of text. Oldest lines exceeding this limit are discarded from scrollback buffer.\n"
+"Limits how many lines chat will keep in scrollback buffer. Chat keeps "
+"specified number of last lines of text. Oldest lines exceeding this limit "
+"are discarded from scrollback buffer.\n"
 "\n"
 "Note: keeping too many lines in scroll buffer can slow client down."
 msgstr ""
@@ -4118,8 +4210,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:139
 msgid ""
-"If this setting enabled, client will load old chat tabs content from logs on"
-" startup instead of starting with empty chat tabs."
+"If this setting enabled, client will load old chat tabs content from logs on "
+"startup instead of starting with empty chat tabs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4130,9 +4222,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:146
 msgid ""
-"If this setting is enabled, online status changes of party members will be shown in party tab of chat.\n"
+"If this setting is enabled, online status changes of party members will be "
+"shown in party tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4143,9 +4237,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:154
 msgid ""
-"If this setting is enabled, online status changes of guild members will be shown in guild tab of chat.\n"
+"If this setting is enabled, online status changes of guild members will be "
+"shown in guild tab of chat.\n"
 "\n"
-"This adds some extra noise to chat, but allows one to see when your buddies are coming online."
+"This adds some extra noise to chat, but allows one to see when your buddies "
+"are coming online."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4161,9 +4257,13 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:166
 msgid ""
-"If this setting enabled, no messages related to built-in ManaPlus shop will be displayed in chat. Disable this setting if you want to see shop-related messages.\n"
+"If this setting enabled, no messages related to built-in ManaPlus shop will "
+"be displayed in chat. Disable this setting if you want to see shop-related "
+"messages.\n"
 "\n"
-"Note: technically, ManaPlus shop implemented as usual private messages with special content. If you disable this setting, you will be able to see these messages and get idea when other players are looking at your shop."
+"Note: technically, ManaPlus shop implemented as usual private messages with "
+"special content. If you disable this setting, you will be able to see these "
+"messages and get idea when other players are looking at your shop."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4176,7 +4276,8 @@ msgstr ""
 msgid ""
 "Enable this setting to see MVP messages from server.\n"
 "\n"
-"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature usually makes little difference."
+"Note: MVP messages are not used on TMW/Evol/etc servers, so this feature "
+"usually makes little difference."
 msgstr ""
 
 #. TRANSLATORS: settings group
@@ -4195,9 +4296,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:189
 msgid ""
-"If this setting enabled, all whispers (private messages) will be placed in separate tabs, separate tab for each player. If this setting disabled, all whispers will appear in General tab.\n"
+"If this setting enabled, all whispers (private messages) will be placed in "
+"separate tabs, separate tab for each player. If this setting disabled, all "
+"whispers will appear in General tab.\n"
 "\n"
-"Note: putting all whispers to single General tab is known to be confusing. Think twice before disabling this feature."
+"Note: putting all whispers to single General tab is known to be confusing. "
+"Think twice before disabling this feature."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4208,7 +4312,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:199
 msgid ""
-"If this setting is enabled, spell invocation will be shown in Debug tab. If disabled, it will be shown in General tab instead.\n"
+"If this setting is enabled, spell invocation will be shown in Debug tab. If "
+"disabled, it will be shown in General tab instead.\n"
 "\n"
 "Note: it does not affects server replies related to spells."
 msgstr ""
@@ -4221,9 +4326,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:207
 msgid ""
-"If this setting is enabled, server messages will be shown in Debug tab of chat. If disabled, server messages will appear in General chat instead.\n"
+"If this setting is enabled, server messages will be shown in Debug tab of "
+"chat. If disabled, server messages will appear in General chat instead.\n"
 "\n"
-"Note: according to 4144, disabling this could also make you to lose some debug messages from client in Debug tab since these are fake server messages."
+"Note: according to 4144, disabling this could also make you to lose some "
+"debug messages from client in Debug tab since these are fake server messages."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4248,9 +4355,11 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:226
 msgid ""
-"If enabled, GM tab will appear in chat. It displays text related GM activity.\n"
+"If enabled, GM tab will appear in chat. It displays text related GM "
+"activity.\n"
 "\n"
-"Note: this setting only makes difference for GMs (Game Masters) since this tab only appears for GMs."
+"Note: this setting only makes difference for GMs (Game Masters) since this "
+"tab only appears for GMs."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4261,7 +4370,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:234
 msgid ""
-"If this feature enabled, language tab will appear if server supports this feature.\n"
+"If this feature enabled, language tab will appear if server supports this "
+"feature.\n"
 "\n"
 "Note: only supported by Evol server yet."
 msgstr ""
@@ -4274,7 +4384,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:242
 msgid ""
-"If this setting enabled and server supports different chats for different languages, you will see messages for all languages, regardless of your language preferences.\n"
+"If this setting enabled and server supports different chats for different "
+"languages, you will see messages for all languages, regardless of your "
+"language preferences.\n"
 "\n"
 "Note: it only works on servers supporting language tabs feature, like Evol."
 msgstr ""
@@ -4287,7 +4399,9 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:252
 msgid ""
-"If this setting enabled, Battle tab will appear in chat. This tab will contain messages related to battles, like damage and experience gain, if battle messages are enabled.\n"
+"If this setting enabled, Battle tab will appear in chat. This tab will "
+"contain messages related to battles, like damage and experience gain, if "
+"battle messages are enabled.\n"
 "\n"
 "Note: client restart required to take effect."
 msgstr ""
@@ -4313,7 +4427,10 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:269
 msgid ""
-"If this feature enabled, text in chat will be automatically adjusted to adapt to appearance of chat input field when you typing message and when input field of chat disappears. If disabled, chat input area will always occupy its place, which could be otherwise usable for text.\n"
+"If this feature enabled, text in chat will be automatically adjusted to "
+"adapt to appearance of chat input field when you typing message and when "
+"input field of chat disappears. If disabled, chat input area will always "
+"occupy its place, which could be otherwise usable for text.\n"
 "\n"
 "Note: its mostly about jumpy attitude vs less usable space for text."
 msgstr ""
@@ -4348,7 +4465,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:299
 msgid ""
-"Here you can specify some extra words which will also cause highlighting. Use comma to separate words.\n"
+"Here you can specify some extra words which will also cause highlighting. "
+"Use comma to separate words.\n"
 "\n"
 "Note: frequent highlights are annoying - use it with caution."
 msgstr ""
@@ -4361,7 +4479,8 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:307
 msgid ""
-"This setting allows you to ignore some global messages if particular sender (NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
+"This setting allows you to ignore some global messages if particular sender "
+"(NPC, GM) annoys you too much. Global will be moved to Debug instead.\n"
 "\n"
 "Note: careless use of this feature can make you to miss important announces!"
 msgstr ""
@@ -4374,9 +4493,12 @@ msgstr ""
 #. TRANSLATORS: settings description
 #: src/gui/widgets/tabs/setup_chat.cpp:316
 msgid ""
-"If this setting enabled, button will appear near text input field. This button allows one to invoke composing window, which allows one to insert smiles and text formatting easily.\n"
+"If this setting enabled, button will appear near text input field. This "
+"button allows one to invoke composing window, which allows one to insert "
+"smiles and text formatting easily.\n"
 "\n"
-"Note: same window can also be invoked by hotkey when typing, usually F1 by default."
+"Note: same window can also be invoked by hotkey when typing, usually F1 by "
+"default."
 msgstr ""
 
 #. TRANSLATORS: settings option
@@ -4465,11 +4587,6 @@ msgid "Unassign"
 msgstr ""
 
 #. TRANSLATORS: button in input settings tab
-#: src/gui/widgets/tabs/setup_input.cpp:69
-msgid "Default"
-msgstr "預設"
-
-#. TRANSLATORS: button in input settings tab
 #: src/gui/widgets/tabs/setup_input.cpp:71
 msgid "Reset all keys"
 msgstr ""
@@ -5754,70 +5871,70 @@ msgid "Atk"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:65
+#: src/gui/widgets/tabs/socialattacktab.h:66
 msgid "Priority mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:67
+#: src/gui/widgets/tabs/socialattacktab.h:68
 msgid "Attack mobs"
 msgstr ""
 
 #. TRANSLATORS: mobs group name in social window
-#: src/gui/widgets/tabs/socialattacktab.h:69
+#: src/gui/widgets/tabs/socialattacktab.h:70
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialfriendstab.h:114
+#: src/gui/widgets/tabs/socialfriendstab.h:115
 #, c-format
 msgid "Friends: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab2.h:97
-#: src/gui/widgets/tabs/socialguildtab.h:166
-#: src/gui/widgets/tabs/socialpartytab.h:159
+#: src/gui/widgets/tabs/socialguildtab2.h:98
+#: src/gui/widgets/tabs/socialguildtab.h:167
+#: src/gui/widgets/tabs/socialpartytab.h:160
 #, c-format
 msgid "Players: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:84
+#: src/gui/widgets/tabs/socialguildtab.h:85
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialguildtab.h:102
+#: src/gui/widgets/tabs/socialguildtab.h:103
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:118
+#: src/gui/widgets/tabs/socialguildtab.h:119
 msgid "Member Invite to Guild"
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/widgets/tabs/socialguildtab.h:120
+#: src/gui/widgets/tabs/socialguildtab.h:121
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:130
+#: src/gui/widgets/tabs/socialguildtab.h:131
 msgid "Leave Guild?"
 msgstr ""
 
 #. TRANSLATORS: guild leave message
-#: src/gui/widgets/tabs/socialguildtab.h:132
+#: src/gui/widgets/tabs/socialguildtab.h:133
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialguildtab.h:142
+#: src/gui/widgets/tabs/socialguildtab.h:143
 #, c-format
 msgid "Members: %u/%u"
 msgstr ""
@@ -5829,41 +5946,41 @@ msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialnavigationtab.h:161
+#: src/gui/widgets/tabs/socialnavigationtab.h:162
 #, c-format
 msgid "Portals: %u/%u"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/widgets/tabs/socialpartytab.h:86
+#: src/gui/widgets/tabs/socialpartytab.h:87
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
 #. TRANSLATORS: tab in social window
-#: src/gui/widgets/tabs/socialpartytab.h:103
+#: src/gui/widgets/tabs/socialpartytab.h:104
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:119
+#: src/gui/widgets/tabs/socialpartytab.h:120
 msgid "Member Invite to Party"
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/widgets/tabs/socialpartytab.h:121
+#: src/gui/widgets/tabs/socialpartytab.h:122
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:131
+#: src/gui/widgets/tabs/socialpartytab.h:132
 msgid "Leave Party?"
 msgstr ""
 
 #. TRANSLATORS: party leave message
-#: src/gui/widgets/tabs/socialpartytab.h:133
+#: src/gui/widgets/tabs/socialpartytab.h:134
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
@@ -5875,17 +5992,17 @@ msgid "Pik"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:65
+#: src/gui/widgets/tabs/socialpickuptab.h:66
 msgid "Pickup items"
 msgstr ""
 
 #. TRANSLATORS: items group name in social window
-#: src/gui/widgets/tabs/socialpickuptab.h:67
+#: src/gui/widgets/tabs/socialpickuptab.h:68
 msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:188
+#: src/gui/widgets/tabs/socialplayerstab.h:189
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
@@ -6118,10 +6235,8 @@ msgstr ""
 #. TRANSLATORS: buy dialog button
 #. TRANSLATORS: char create dialog button
 #. TRANSLATORS: char select dialog. button.
-#. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:281 src/gui/windows/charcreatedialog.cpp:112
 #: src/gui/windows/charselectdialog.cpp:609
-#: src/gui/windows/socialwindow.cpp:77
 msgid "Create"
 msgstr "建立隊伍"
 
@@ -6238,8 +6353,7 @@ msgstr ""
 #: src/gui/windows/charcreatedialog.cpp:196
 #: src/gui/windows/charcreatedialog.cpp:209
 #: src/gui/windows/charcreatedialog.cpp:220
-#: src/gui/windows/charcreatedialog.cpp:230
-#: src/gui/windows/outfitwindow.cpp:65
+#: src/gui/windows/charcreatedialog.cpp:230 src/gui/windows/outfitwindow.cpp:65
 msgid ">"
 msgstr ""
 
@@ -6257,8 +6371,7 @@ msgstr "請分配%d點數"
 #: src/gui/windows/charcreatedialog.cpp:200
 #: src/gui/windows/charcreatedialog.cpp:211
 #: src/gui/windows/charcreatedialog.cpp:222
-#: src/gui/windows/charcreatedialog.cpp:232
-#: src/gui/windows/outfitwindow.cpp:63
+#: src/gui/windows/charcreatedialog.cpp:232 src/gui/windows/outfitwindow.cpp:63
 msgid "<"
 msgstr ""
 
@@ -6284,8 +6397,7 @@ msgstr ""
 
 #. TRANSLATORS: one char size female character gender
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/windows/charcreatedialog.cpp:251
-#: src/gui/windows/socialwindow.cpp:73
+#: src/gui/windows/charcreatedialog.cpp:251 src/gui/windows/socialwindow.cpp:72
 msgid "F"
 msgstr ""
 
@@ -6450,11 +6562,6 @@ msgid "Yes"
 msgstr "是"
 
 #. TRANSLATORS: debug window tab
-#: src/gui/windows/debugwindow.cpp:63
-msgid "Target"
-msgstr ""
-
-#. TRANSLATORS: debug window tab
 #: src/gui/windows/debugwindow.cpp:65
 msgid "Net"
 msgstr ""
@@ -6486,8 +6593,7 @@ msgstr ""
 
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: servers dialog button
-#: src/gui/windows/editserverdialog.cpp:57
-#: src/gui/windows/serverdialog.cpp:106
+#: src/gui/windows/editserverdialog.cpp:57 src/gui/windows/serverdialog.cpp:106
 msgid "Connect"
 msgstr ""
 
@@ -6556,8 +6662,8 @@ msgstr ""
 #. TRANSLATORS: unknown equipment page name
 #. TRANSLATORS: unknown hosts group name
 #. TRANSLATORS: Skill type
-#: src/gui/windows/equipmentwindow.cpp:672
-#: src/gui/windows/serverdialog.cpp:455 src/resources/skill/skillinfo.cpp:118
+#: src/gui/windows/equipmentwindow.cpp:672 src/gui/windows/serverdialog.cpp:455
+#: src/resources/skill/skillinfo.cpp:121
 msgid "Unknown"
 msgstr ""
 
@@ -6851,15 +6957,13 @@ msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:61
-#: src/gui/windows/mailviewwindow.cpp:105
+#: src/gui/windows/maileditwindow.cpp:61 src/gui/windows/mailviewwindow.cpp:105
 msgid "Money:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view item label
-#: src/gui/windows/maileditwindow.cpp:63
-#: src/gui/windows/mailviewwindow.cpp:124
+#: src/gui/windows/maileditwindow.cpp:63 src/gui/windows/mailviewwindow.cpp:124
 #: src/gui/windows/mailviewwindow.cpp:133
 msgid "Item:"
 msgstr ""
@@ -7261,173 +7365,138 @@ msgid "Up"
 msgstr "升級"
 
 #. TRANSLATORS: skills dialog label
-#: src/gui/windows/skilldialog.cpp:208
+#: src/gui/windows/skilldialog.cpp:213
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog default skill tab
-#: src/gui/windows/skilldialog.cpp:311
+#: src/gui/windows/skilldialog.cpp:316
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:365
+#: src/gui/windows/skilldialog.cpp:370
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill id
-#: src/gui/windows/skilldialog.cpp:416
+#: src/gui/windows/skilldialog.cpp:421
 #, c-format
 msgid "Skill %u"
 msgstr ""
 
 #. TRANSLATORS: skills dialog. skill level
 #. TRANSLATORS: skill level
-#: src/gui/windows/skilldialog.cpp:554 src/resources/skill/skillinfo.cpp:101
+#: src/gui/windows/skilldialog.cpp:559 src/resources/skill/skillinfo.cpp:104
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
 #. TRANSLATORS: skill error message
-#: src/gui/windows/skilldialog.cpp:561
+#: src/gui/windows/skilldialog.cpp:566
 #, c-format
 msgid "Failed skill: %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog header
-#: src/gui/windows/skilldialog.cpp:825
+#: src/gui/windows/skilldialog.cpp:932 src/gui/windows/skilldialog.cpp:996
+#: src/gui/windows/skilldialog.cpp:1115
 #, c-format
 msgid "Add text to skill %s"
 msgstr ""
 
 #. TRANSLATORS: text skill dialog field
-#: src/gui/windows/skilldialog.cpp:828
+#: src/gui/windows/skilldialog.cpp:935 src/gui/windows/skilldialog.cpp:999
+#: src/gui/windows/skilldialog.cpp:1118
 msgid "Text: "
 msgstr ""
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/windows/socialwindow.cpp:68
+#: src/gui/windows/socialwindow.cpp:67
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: social window button
-#: src/gui/windows/socialwindow.cpp:79
-msgid "Invite"
+#: src/gui/windows/socialwindow.cpp:75
+msgid "Menu"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:270
+#: src/gui/windows/socialwindow.cpp:261
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:282
+#: src/gui/windows/socialwindow.cpp:273
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:300
+#: src/gui/windows/socialwindow.cpp:291
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:319
+#: src/gui/windows/socialwindow.cpp:310
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
 #. TRANSLATORS: chat message
 #: src/gui/windows/socialwindow.cpp:367
-#, c-format
-msgid "Creating guild called %s."
-msgstr ""
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:392
-#, c-format
-msgid "Creating party called %s."
-msgstr ""
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:409
-msgid "Guild Name"
-msgstr ""
-
-#. TRANSLATORS: guild creation message
-#: src/gui/windows/socialwindow.cpp:411
-msgid "Choose your guild's name."
-msgstr ""
-
-#. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:426
 msgid "Received guild request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:435
+#: src/gui/windows/socialwindow.cpp:376
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
 #. TRANSLATORS: guild invite message
-#: src/gui/windows/socialwindow.cpp:443
+#: src/gui/windows/socialwindow.cpp:384
 msgid "Accept Guild Invite"
 msgstr ""
 
 #. TRANSLATORS: chat message
-#: src/gui/windows/socialwindow.cpp:463
+#: src/gui/windows/socialwindow.cpp:404
 msgid "Received party request, but one already exists."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:476
+#: src/gui/windows/socialwindow.cpp:417
 msgid "You have been invited you to join a party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:481
+#: src/gui/windows/socialwindow.cpp:422
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:490
+#: src/gui/windows/socialwindow.cpp:431
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:496
+#: src/gui/windows/socialwindow.cpp:437
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
 #. TRANSLATORS: party invite message
-#: src/gui/windows/socialwindow.cpp:507
+#: src/gui/windows/socialwindow.cpp:448
 msgid "Accept Party Invite"
 msgstr ""
 
-#. TRANSLATORS: party creation error
-#: src/gui/windows/socialwindow.cpp:529
-msgid "Cannot create party. You are already in a party"
-msgstr ""
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:542
-msgid "Party Name"
-msgstr ""
-
-#. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:544
-msgid "Choose your party's name."
-msgstr ""
-
 #. TRANSLATORS: status window label
 #: src/gui/windows/statuswindow.cpp:76
 msgid "HP:"
@@ -7567,8 +7636,7 @@ msgstr ""
 
 #. TRANSLATORS: trade error
 #: src/gui/windows/tradewindow.cpp:526
-msgid ""
-"Failed adding item. You can not overlap one kind of item on the window."
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "增加物品失敗。你不能覆蓋視窗中的物品."
 
 #. TRANSLATORS: trade error
@@ -7654,25 +7722,25 @@ msgstr ""
 #. TRANSLATORS: long key name. must be short.
 #. TRANSLATORS: short key name. must be very short.
 #. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:395 src/input/inputmanager.cpp:438
+#: src/input/inputmanager.cpp:396 src/input/inputmanager.cpp:439
 #: src/input/keyboardconfig.cpp:101
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:401
+#: src/input/inputmanager.cpp:402
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:415
+#: src/input/inputmanager.cpp:416
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:444
+#: src/input/inputmanager.cpp:445
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -7680,7 +7748,7 @@ msgstr ""
 #. TRANSLATORS: unknown short key type. must be short
 #. TRANSLATORS: Unknown key short string.
 #. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:458 src/input/keyboardconfig.cpp:145
+#: src/input/inputmanager.cpp:459 src/input/keyboardconfig.cpp:145
 msgid "u key"
 msgstr ""
 
@@ -10566,30 +10634,30 @@ msgid "Error saving location. You do not have warp skill."
 msgstr ""
 
 #. TRANSLATORS: skill level
-#: src/resources/skill/skillinfo.cpp:106
+#: src/resources/skill/skillinfo.cpp:109
 #, c-format
 msgid "Lvl: %d / %d"
 msgstr ""
 
 #. TRANSLATORS: skill type
-#: src/resources/skill/skillinfo.cpp:113
+#: src/resources/skill/skillinfo.cpp:116
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skillinfo.cpp:137
+#: src/resources/skill/skillinfo.cpp:140
 msgid "Unknown:"
 msgstr ""
 
 #. TRANSLATORS: skill mana
-#: src/resources/skill/skillinfo.cpp:144
+#: src/resources/skill/skillinfo.cpp:147
 #, c-format
 msgid " / Mana: -%d"
 msgstr ""
 
 #. TRANSLATORS: skill range
-#: src/resources/skill/skillinfo.cpp:152
+#: src/resources/skill/skillinfo.cpp:155
 #, c-format
 msgid "Range: %d"
 msgstr ""
@@ -10600,11 +10668,6 @@ msgid "Ground"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/resources/skill/skilltypelist.h:39
-msgid "Self"
-msgstr ""
-
-#. TRANSLATORS: Skill type
 #: src/resources/skill/skilltypelist.h:41
 msgid "Unused"
 msgstr ""
@@ -10679,3 +10742,6 @@ msgstr "%d 秒"
 #, c-format
 msgid "%d seconds"
 msgstr "%d 秒"
+
+#~ msgid "Guild name is missing."
+#~ msgstr "欠缺公會名稱."